public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix tests 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2025-05-30 08:33:38 +08:00
parent 697272785d
commit d713a93079
16 changed files with 10 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/test-cases/chart-needs.sh
View File

@ -34,7 +34,8 @@ done
for i in $(seq 10); do for i in $(seq 10); do
info "Comparing diff/chart-needs #$i" info "Comparing diff/chart-needs #$i"
${helmfile} -f ${chart_need_case_input_dir}/${config_file} diff --include-needs | grep -Ev "Comparing release=azuredisk-csi-storageclass, chart=/tmp/.*/azuredisk-csi-storageclass" > ${chart_needs_diff_reverse} || fail "\"helmfile diff\" shouldn't fail" ${helmfile} -f ${chart_need_case_input_dir}/${config_file} diff --include-needs | grep -Ev "Comparing release=azuredisk-csi-storageclass, chart=/tmp/.*/azuredisk-csi-storageclass" > ${chart_needs_diff_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
cat ${chart_needs_diff_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${chart_needs_diff_reverse}
diff -u ${diff_out_file} ${chart_needs_diff_reverse} || fail "\"helmfile diff\" should be consistent" diff -u ${diff_out_file} ${chart_needs_diff_reverse} || fail "\"helmfile diff\" should be consistent"
echo code=$? echo code=$?
done done

10
test/integration/test-cases/chart-needs/output/diff
View File

@ -1,8 +1,3 @@
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, managed-csi, StorageClass (storage.k8s.io) has been added: helmfile-tests, managed-csi, StorageClass (storage.k8s.io) has been added:
- -
+ # Source: azuredisk-csi-storageclass/templates/azuredisk-csi-storageclass.yaml + # Source: azuredisk-csi-storageclass/templates/azuredisk-csi-storageclass.yaml
@ -20,11 +15,6 @@ helmfile-tests, managed-csi, StorageClass (storage.k8s.io) has been added:
+ allowVolumeExpansion: true + allowVolumeExpansion: true
Comparing release=azuredisk-csi-driver, chart=azuredisk-csi-driver/azuredisk-csi-driver, namespace=helmfile-tests Comparing release=azuredisk-csi-driver, chart=azuredisk-csi-driver/azuredisk-csi-driver, namespace=helmfile-tests
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, azuredisk-csi-attacher-binding, ClusterRoleBinding (rbac.authorization.k8s.io) has been added: helmfile-tests, azuredisk-csi-attacher-binding, ClusterRoleBinding (rbac.authorization.k8s.io) has been added:
- -
+ # Source: azuredisk-csi-driver/templates/rbac-csi-azuredisk-controller.yaml + # Source: azuredisk-csi-driver/templates/rbac-csi-azuredisk-controller.yaml

10
test/integration/test-cases/chart-needs/output/diff-live
View File

@ -1,14 +1,4 @@
"azuredisk-csi-driver" has been added to your repositories "azuredisk-csi-driver" has been added to your repositories
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, managed-csi, StorageClass (storage.k8s.io) has been added: helmfile-tests, managed-csi, StorageClass (storage.k8s.io) has been added:
- -
+ # Source: azuredisk-csi-storageclass/templates/azuredisk-csi-storageclass.yaml + # Source: azuredisk-csi-storageclass/templates/azuredisk-csi-storageclass.yaml

8
test/integration/test-cases/chartify-with-non-chart-dir.sh
View File

@ -13,16 +13,12 @@ if [[ $EXTRA_HELMFILE_FLAGS == *--enable-live-output* ]]; then
diff_out_file=${chartify_with_non_chart_dirt_output_dir}/diff-result-live diff_out_file=${chartify_with_non_chart_dirt_output_dir}/diff-result-live
fi fi
if [[ $(semver compare $HELM_DIFF_VERSION "3.11.0") == "1" ]]; then
diff_out_file=${diff_out_file}-after-helm-diff-3.11.0
fi
test_start "$case_title" test_start "$case_title"
info "Comparing ${case_title} diff for output ${chartify_with_non_chart_dirt_reverse} with ${diff_out_file}" info "Comparing ${case_title} diff for output ${chartify_with_non_chart_dirt_reverse} with ${diff_out_file}"
for i in $(seq 10); do for i in $(seq 10); do
info "Comparing chartify-with-non-chart-dir diff log #$i" info "Comparing chartify-with-non-chart-dir diff log #$i"
${helmfile} -f ${chartify_with_non_chart_dirt_input_dir}/helmfiles/helmfile.yaml diff | grep -v "^Comparing release" > ${chartify_with_non_chart_dirt_reverse} || fail "\"helmfile diff\" shouldn't fail" ${helmfile} -f ${chartify_with_non_chart_dirt_input_dir}/helmfiles/helmfile.yaml diff | grep -v "^Comparing release" > ${chartify_with_non_chart_dirt_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
cat ${chartify_with_non_chart_dirt_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${chartify_with_non_chart_dirt_reverse}
diff -u ${diff_out_file} ${chartify_with_non_chart_dirt_reverse} || fail "\"helmfile diff\" should be consistent" diff -u ${diff_out_file} ${chartify_with_non_chart_dirt_reverse} || fail "\"helmfile diff\" should be consistent"
echo code=$? echo code=$?
done done

5
test/integration/test-cases/chartify-with-non-chart-dir/output/diff-result
View File

@ -1,8 +1,3 @@
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, configmap, ConfigMap (v1) has been added: helmfile-tests, configmap, ConfigMap (v1) has been added:
- -
+ # Source: manifests/templates/configmap.yaml + # Source: manifests/templates/configmap.yaml

13
test/integration/test-cases/chartify-with-non-chart-dir/output/diff-result-after-helm-diff-3.11.0
View File

@ -1,13 +0,0 @@
helmfile-tests, configmap, ConfigMap (v1) has been added:
-
+ # Source: manifests/templates/configmap.yaml
+ # Source: manifests/templates/configmap.yaml
+ apiVersion: v1
+ kind: ConfigMap
+ metadata:
+ name: configmap
+ namespace: helmfile-tests
+ data:
+ foo: "bar"
+ bar: "baz"

5
test/integration/test-cases/chartify-with-non-chart-dir/output/diff-result-live
View File

@ -1,8 +1,3 @@
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, configmap, ConfigMap (v1) has been added: helmfile-tests, configmap, ConfigMap (v1) has been added:
- -
+ # Source: manifests/templates/configmap.yaml + # Source: manifests/templates/configmap.yaml

12
test/integration/test-cases/chartify-with-non-chart-dir/output/diff-result-live-after-helm-diff-3.11.0
View File

@ -1,12 +0,0 @@
helmfile-tests, configmap, ConfigMap (v1) has been added:
-
+ # Source: manifests/templates/configmap.yaml
+ # Source: manifests/templates/configmap.yaml
+ apiVersion: v1
+ kind: ConfigMap
+ metadata:
+ name: configmap
+ namespace: helmfile-tests
+ data:
+ foo: "bar"
+ bar: "baz"

3
test/integration/test-cases/diff-args.sh
View File

@ -22,7 +22,8 @@ info "Comparing ${case_title} diff for output ${diff_args_reverse} with ${diff_o
info "Comparing ${case_title} diff for output ${diff_args_reverse_stderr} with ${diff_out_stderr_file}" info "Comparing ${case_title} diff for output ${diff_args_reverse_stderr} with ${diff_out_stderr_file}"
for i in $(seq 10); do for i in $(seq 10); do
info "Comparing diff-args diff log #$i" info "Comparing diff-args diff log #$i"
${helmfile} -f ${diff_args_input_dir}/helmfile.yaml diff 1> ${diff_args_reverse} 2> ${diff_args_reverse_stderr} || fail "\"helmfile diff\" shouldn't fail" ${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_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)" diff -u ${diff_out_stderr_file} ${diff_args_reverse_stderr} || fail "\"helmfile diff\" should be consistent (stderr)"
echo code=$? echo code=$?

5
test/integration/test-cases/diff-args/output/diff
View File

@ -1,9 +1,4 @@
Comparing release=installed, chart=../../../charts/httpbin, namespace=helmfile-tests Comparing release=installed, chart=../../../charts/httpbin, namespace=helmfile-tests
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, installed-httpbin, Deployment (apps) has been added: helmfile-tests, installed-httpbin, Deployment (apps) has been added:
- -
+ apiVersion: apps/v1 + apiVersion: apps/v1

5
test/integration/test-cases/diff-args/output/diff-live
View File

@ -1,8 +1,3 @@
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, installed-httpbin, Deployment (apps) has been added: helmfile-tests, installed-httpbin, Deployment (apps) has been added:
- -
+ apiVersion: apps/v1 + apiVersion: apps/v1

3
test/integration/test-cases/postrender.sh
View File

@ -20,7 +20,8 @@ test_start "postrender diff"
info "Comparing postrender diff output ${postrender_diff_reverse} with ${postrender_case_output_dir}/result.yaml" info "Comparing postrender diff output ${postrender_diff_reverse} with ${postrender_case_output_dir}/result.yaml"
for i in $(seq 10); do for i in $(seq 10); do
info "Comparing build/postrender-diff #$i" info "Comparing build/postrender-diff #$i"
${helmfile} -f ${postrender_case_input_dir}/${config_file} diff --concurrency 1 --post-renderer ./add-cm.bash --post-renderer-args cm1 &> ${postrender_diff_reverse} || fail "\"helmfile diff\" shouldn't fail" ${helmfile} -f ${postrender_case_input_dir}/${config_file} diff --concurrency 1 --post-renderer ./add-cm.bash --post-renderer-args cm1 &> ${postrender_diff_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
cat ${postrender_diff_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${postrender_diff_reverse}
diff -u ${postrender_diff_out_file} ${postrender_diff_reverse} || fail "\"helmfile diff\" should be consistent" diff -u ${postrender_diff_out_file} ${postrender_diff_reverse} || fail "\"helmfile diff\" should be consistent"
echo code=$? echo code=$?
done done

10
test/integration/test-cases/postrender/output/diff-result
View File

@ -1,11 +1,6 @@
Building dependency release=foo, chart=../../../charts/raw Building dependency release=foo, chart=../../../charts/raw
Building dependency release=baz, chart=../../../charts/raw Building dependency release=baz, chart=../../../charts/raw
Comparing release=foo, chart=../../../charts/raw, namespace=helmfile-tests Comparing release=foo, chart=../../../charts/raw, namespace=helmfile-tests
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, cm2, ConfigMap (v1) has been added: helmfile-tests, cm2, ConfigMap (v1) has been added:
- -
+ apiVersion: v1 + apiVersion: v1
@ -26,11 +21,6 @@ helmfile-tests, foo-1, ConfigMap (v1) has been added:
+ foo: FOO + foo: FOO
Comparing release=baz, chart=../../../charts/raw, namespace=helmfile-tests Comparing release=baz, chart=../../../charts/raw, namespace=helmfile-tests
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, baz-3, ConfigMap (v1) has been added: helmfile-tests, baz-3, ConfigMap (v1) has been added:
- -
+ # Source: raw/templates/resources.yaml + # Source: raw/templates/resources.yaml

3
test/integration/test-cases/skip-diff-output.sh
View File

@ -17,7 +17,8 @@ test_start "$case_title"
info "Comparing ${case_title} diff for output ${skip_diff_output_reverse} with ${diff_out_file}" info "Comparing ${case_title} diff for output ${skip_diff_output_reverse} with ${diff_out_file}"
for i in $(seq 10); do for i in $(seq 10); do
info "Comparing skip-diff-output diff log #$i" info "Comparing skip-diff-output diff log #$i"
${helmfile} -f ${skip_diff_output_input_dir}/helmfile.yaml.gotmpl diff > ${skip_diff_output_reverse} || fail "\"helmfile diff\" shouldn't fail" ${helmfile} -f ${skip_diff_output_input_dir}/helmfile.yaml.gotmpl diff > ${skip_diff_output_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
cat ${skip_diff_output_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${skip_diff_output_reverse}
diff -u ${diff_out_file} ${skip_diff_output_reverse} || fail "\"helmfile diff\" should be consistent" diff -u ${diff_out_file} ${skip_diff_output_reverse} || fail "\"helmfile diff\" should be consistent"
echo code=$? echo code=$?
done done

5
test/integration/test-cases/skip-diff-output/output/diff-result
View File

@ -1,9 +1,4 @@
Comparing release=baz, chart=../../../charts/raw, namespace=helmfile-tests Comparing release=baz, chart=../../../charts/raw, namespace=helmfile-tests
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, baz-2, ConfigMap (v1) has been added: helmfile-tests, baz-2, ConfigMap (v1) has been added:
- -
+ # Source: raw/templates/resources.yaml + # Source: raw/templates/resources.yaml

5
test/integration/test-cases/skip-diff-output/output/diff-result-live
View File

@ -1,8 +1,3 @@
********************
Release was not present in Helm. Diff will show entire contents as new.
********************
helmfile-tests, baz-2, ConfigMap (v1) has been added: helmfile-tests, baz-2, ConfigMap (v1) has been added:
- -
+ # Source: raw/templates/resources.yaml + # Source: raw/templates/resources.yaml