mirror of
https://github.com/helmfile/helmfile.git
synced 2026-10-21 09:12:13 +02:00
* test: add integration test for issue #1880 transformers with file:// deps Add an integration test reproducing the exact scenario from issue #1880: a local chart with a relative file:// dependency (file://../library) used together with kustomize transformers. Before the fix (rewriteChartDependencies in PR #2334), chartify copied the chart to a temp directory, breaking the relative file:// path and causing helm dependency up to fail with: Error: directory /tmp/chartify.../monitoring/library not found Also fix test artifact leak in issue923_test.go where OCI chart downloads wrote to CWD because OutputDirTemplate lacked {{ .OutputDir }}. Closes #1880 Signed-off-by: yxxhero <aiopsclub@163.com> * fix(test): guard exit-code captures against set -e in integration tests Under set -e (enabled in run.sh), a failing command exits the shell before 'var=$?' can execute, defeating diagnostic cat+fail blocks and breaking helm diff tests that expect exit code 2. Replaced 'cmd; var=$?' with 'var=0; cmd || var=$?' across 12 test files (29 sites), matching the pattern already used in oci-parallel-pull.sh. Signed-off-by: yxxhero <aiopsclub@163.com> --------- Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package state
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"testing"
|
||||
@@ -12,11 +13,26 @@ import (
|
||||
"github.com/helmfile/helmfile/pkg/exectest"
|
||||
)
|
||||
|
||||
// cleanupLeakedChartDirs removes chart directories and lock files that
|
||||
// PrepareCharts may leak into the CWD when OutputDirTemplate does not include
|
||||
// {{ .OutputDir }}. This is a safety net; the proper fix is to always
|
||||
// include {{ .OutputDir }}.
|
||||
func cleanupLeakedChartDirs(t *testing.T, dirs ...string) {
|
||||
t.Helper()
|
||||
t.Cleanup(func() {
|
||||
for _, d := range dirs {
|
||||
_ = os.RemoveAll(d)
|
||||
_ = os.Remove(d + ".lock")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TestIssue923_OCIChartPreparedForNeededRelease verifies that OCI charts are
|
||||
// prepared (pulled) for releases that are included via --include-needs.
|
||||
// See https://github.com/helmfile/helmfile/issues/923
|
||||
func TestIssue923_OCIChartPreparedForNeededRelease(t *testing.T) {
|
||||
resetChartCacheForTest()
|
||||
cleanupLeakedChartDirs(t, "argocd", "argocd-secrets")
|
||||
helmfileContent := []byte(`
|
||||
repositories:
|
||||
- name: huma
|
||||
@@ -61,12 +77,13 @@ releases:
|
||||
// PrepareCharts uses opts.IncludeTransitiveNeeds to determine which releases
|
||||
// to prepare charts for. When --include-needs is set, this should be true,
|
||||
// matching c.IncludeNeeds() in the app layer.
|
||||
// OutputDirTemplate is set to force charts into tempDir (not the global cache).
|
||||
// OutputDirTemplate includes .OutputDir so charts go into tempDir (auto-cleaned
|
||||
// by t.TempDir), not the global cache or CWD.
|
||||
opts := ChartPrepareOptions{
|
||||
SkipResolve: true,
|
||||
IncludeTransitiveNeeds: true,
|
||||
Concurrency: 1,
|
||||
OutputDirTemplate: "{{ .Release.Name }}",
|
||||
OutputDirTemplate: "{{ .OutputDir }}/{{ .Release.Name }}",
|
||||
}
|
||||
|
||||
releaseToChart, errs := st.PrepareCharts(helm, tempDir, 1, "apply", opts)
|
||||
@@ -89,6 +106,7 @@ releases:
|
||||
// --include-needs, the OCI chart for the needed release is NOT prepared.
|
||||
func TestIssue923_OCIChartNotPreparedWithoutIncludeNeeds(t *testing.T) {
|
||||
resetChartCacheForTest()
|
||||
cleanupLeakedChartDirs(t, "argocd", "argocd-secrets")
|
||||
helmfileContent := []byte(`
|
||||
repositories:
|
||||
- name: huma
|
||||
@@ -131,7 +149,7 @@ releases:
|
||||
SkipResolve: true,
|
||||
IncludeTransitiveNeeds: false,
|
||||
Concurrency: 1,
|
||||
OutputDirTemplate: "{{ .Release.Name }}",
|
||||
OutputDirTemplate: "{{ .OutputDir }}/{{ .Release.Name }}",
|
||||
}
|
||||
|
||||
releaseToChart, errs := st.PrepareCharts(helm, tempDir, 1, "apply", opts)
|
||||
|
||||
Reference in New Issue
Block a user