Skip to content

Commit 6cc0227

Browse files
authored
Compact and reduce alerts so they don't dominate the diff (#16)
* Compact alerts by writing as one paragraph * Only add capability notifications for `head`, remove line-break
1 parent cdbc78f commit 6cc0227

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

flux-helm-diff.sh

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ output_msg() {
2121
# Message line(s)
2222
for msg in "$@"; do
2323
echo "> ${msg}"
24-
echo '>'
2524
done
2625
echo
2726
} >> "$GITHUB_OUTPUT"
@@ -173,25 +172,27 @@ helm_template() {
173172
# Check if chart is using .Capabilities.KubeVersion
174173
grep -R --include='*.yaml' --include='*.yml' --include='*.tpl' ".Capabilities.KubeVersion" "${chart_temp_path}" > /dev/null && {
175174
echo "${ref} uses \".Capabilities.KubeVersion\"" >&2
176-
if [[ ${#kube_version} -eq 0 ]]; then
177-
output_msg TIP "Chart in \`${ref}\` ref uses [\`.Capabilities.KubeVersion\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) but is not specifying a Kubernetes version to simulate. Will use Helm's default Kubernetes version: \`${helm_default_kube_version}\`." \
178-
"See [Simulating Capabilities](https://github.com/marketplace/actions/flux-helm-diff#simulating-capabilities) for details."
179-
helm_kube_version=() # treat as array, to avoid adding single-quotes
180-
else
181-
output_msg TIP "Chart in \`${ref}\` ref uses [\`.Capabilities.KubeVersion\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) and is simulating the following Kubernetes version: \`${kube_version}\`"
182-
helm_kube_version=(--kube-version "${kube_version}") # treat as array, to avoid adding single-quotes
175+
if [[ "${ref}" == "head" ]]; then
176+
if [[ ${#kube_version} -eq 0 ]]; then
177+
output_msg TIP "Chart in \`${ref}\` ref uses [\`.Capabilities.KubeVersion\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) but is not specifying a Kubernetes version to simulate. Will use Helm's default Kubernetes version: \`${helm_default_kube_version}\`. See [Simulating Capabilities](https://github.com/marketplace/actions/flux-helm-diff#simulating-capabilities) for details."
178+
helm_kube_version=() # treat as array, to avoid adding single-quotes
179+
else
180+
output_msg TIP "Chart in \`${ref}\` ref uses [\`.Capabilities.KubeVersion\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) and is simulating the following Kubernetes version: \`${kube_version}\`"
181+
helm_kube_version=(--kube-version "${kube_version}") # treat as array, to avoid adding single-quotes
182+
fi
183183
fi
184184
}
185185

186186
# Check if chart is using .Capabilities.APIVersions
187187
grep -R --include='*.yaml' --include='*.yml' --include='*.tpl' ".Capabilities.APIVersions" "${chart_temp_path}" > /dev/null && {
188188
echo "${ref} uses \".Capabilities.APIVersions\"" >&2
189-
if [[ ${#api_versions[@]} -eq 0 ]]; then
190-
output_msg IMPORTANT "Chart in \`${ref}\` ref uses [\`.Capabilities.APIVersions\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) but is not specifying any APIs to simulate. Only the built-in API versions are available for templating." \
191-
"See [Simulating Capabilities](https://github.com/marketplace/actions/flux-helm-diff#simulating-capabilities) for details."
192-
else
193-
output_msg TIP "Chart in \`${ref}\` ref uses [\`.Capabilities.APIVersions\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) and is simulating the following APIs, in addition to the built-in:" \
194-
"$(printf "\`%s\`\n" "${api_versions[@]}")"
189+
if [[ "${ref}" == "head" ]]; then
190+
if [[ ${#api_versions[@]} -eq 0 ]]; then
191+
output_msg IMPORTANT "Chart in \`${ref}\` ref uses [\`.Capabilities.APIVersions\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) but is not specifying any APIs to simulate. Only the built-in API versions are available for templating. See [Simulating Capabilities](https://github.com/marketplace/actions/flux-helm-diff#simulating-capabilities) for details."
192+
else
193+
output_msg TIP "Chart in \`${ref}\` ref uses [\`.Capabilities.APIVersions\`](https://helm.sh/docs/chart_template_guide/builtin_objects/) and is simulating the following APIs, in addition to the built-in:" \
194+
"$(printf "\`%s\`\n" "${api_versions[@]}")"
195+
fi
195196
fi
196197
}
197198

0 commit comments

Comments
 (0)