mirror of
https://github.com/helmfile/helmfile.git
synced 2026-09-30 12:54:14 +02:00
Aditya Menon
4f275b3667
This commit adds comprehensive support for Helm 4 while maintaining full backward compatibility with Helm 3. The implementation includes: - Updated helm version detection to support both Helm 3 and Helm 4 - Added HELMFILE_HELM4 environment variable to control Helm version - Modified helm execution paths to handle version-specific binaries - Updated helm plugin installation to support split architecture - Helm 4: Uses split plugin architecture (3 separate .tgz files) - helm-secrets.tgz - helm-secrets-getter.tgz - helm-secrets-post-renderer.tgz - Helm 3: Continues using single plugin installation - Updated Dockerfiles, CI workflows, and core installation code - Helm 4 requires post-renderers to be plugins, not executable scripts - Created Helm plugin structure for integration tests - Updated helmfile.yaml templates to dynamically select renderer type - Added test plugins: add-cm, add-cm1, add-cm2 - Updated integration tests for Helm 3/4 compatibility - Created Helm 4 variant expected output files - Fixed test determinism issues (repo cleanup between iterations) - Added version-specific output filtering for warnings/messages - Updated workflows to test both Helm 3 and Helm 4 - Matrix testing across Helm versions - Updated helm-diff to v3.14.0 for compatibility - Updated README and docs with Helm 4 information - Added migration guidance - Updated version requirements All changes are backward compatible - existing Helm 3 users will see no behavior changes. fix: update Helm 4 lint expected output to match filtered output The grep filter removes the semver warning, so the expected output should not include it. Updated lint-helm4 files to match the filtered output (warning removed, no extra blank line). Signed-off-by: Aditya Menon <amenon@canarytechnologies.com>
45 lines
2.6 KiB
Bash
45 lines
2.6 KiB
Bash
diff_args_input_dir="${cases_dir}/diff-args/input"
|
|
diff_args_output_dir="${cases_dir}/diff-args/output"
|
|
|
|
diff_args_tmp=$(mktemp -d)
|
|
diff_args_reverse=${diff_args_tmp}/diff.args.build.yaml
|
|
diff_args_reverse_stderr=${diff_args_tmp}/diff.args.build.stderr.yaml
|
|
|
|
case_title="diff args"
|
|
diff_out_file=${diff_args_output_dir}/diff
|
|
apply_out_file=${diff_args_output_dir}/apply
|
|
diff_out_stderr_file=${diff_args_output_dir}/diff-stderr
|
|
apply_out_stderr_file=${diff_args_output_dir}/apply-stderr
|
|
if [[ $EXTRA_HELMFILE_FLAGS == *--enable-live-output* ]]; then
|
|
diff_out_file=${diff_args_output_dir}/diff-live
|
|
apply_out_file=${diff_args_output_dir}/apply-live
|
|
diff_out_stderr_file=${diff_args_output_dir}/diff-live-stderr
|
|
apply_out_stderr_file=${diff_args_output_dir}/apply-live-stderr
|
|
fi
|
|
|
|
# Helm 4 has different output format than Helm 3
|
|
if [ "${HELMFILE_HELM4}" = "1" ]; then
|
|
apply_out_file=${apply_out_file}-helm4
|
|
apply_out_stderr_file=${apply_out_stderr_file}-helm4
|
|
fi
|
|
|
|
test_start "$case_title"
|
|
info "Comparing ${case_title} diff for output ${diff_args_reverse} with ${diff_out_file}"
|
|
info "Comparing ${case_title} diff for output ${diff_args_reverse_stderr} with ${diff_out_stderr_file}"
|
|
for i in $(seq 10); do
|
|
info "Comparing diff-args diff log #$i"
|
|
${helmfile} -f ${diff_args_input_dir}/helmfile.yaml diff 1> ${diff_args_reverse}.tmp 2> ${diff_args_reverse_stderr} || fail "\"helmfile diff\" shouldn't fail"
|
|
cat ${diff_args_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${diff_args_reverse}
|
|
diff -u ${diff_out_file} ${diff_args_reverse} || fail "\"helmfile diff\" should be consistent"
|
|
diff -u ${diff_out_stderr_file} ${diff_args_reverse_stderr} || fail "\"helmfile diff\" should be consistent (stderr)"
|
|
done
|
|
info "Comparing ${case_title} apply for output ${diff_args_reverse} with ${apply_out_file}"
|
|
info "Comparing ${case_title} apply for stdout ${diff_args_reverse_stderr} with ${apply_out_stderr_file}"
|
|
${helmfile} -f ${diff_args_input_dir}/helmfile.yaml apply 1> ${diff_args_reverse}.tmp 2> ${diff_args_reverse_stderr} || fail "\"helmfile apply\" shouldn't fail"
|
|
cat ${diff_args_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${diff_args_reverse}
|
|
diff -u ${apply_out_file} <(grep -vE "^(LAST DEPLOYED|installed)" ${diff_args_reverse}) || fail "\"helmfile apply\" should be consistent"
|
|
diff -u ${apply_out_stderr_file} <(grep -vE "^(LAST DEPLOYED|installed)" ${diff_args_reverse_stderr}) || fail "\"helmfile apply\" should be consistent (stderr)"
|
|
echo "clean up diff args resources"
|
|
${helmfile} -f ${diff_args_input_dir}/helmfile.yaml destroy || fail "\"helmfile destroy\" shouldn't fail"
|
|
test_pass "$case_title"
|