[v1.3] Add addon version check with the repo #754
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jian Wang <jian.wang@suse.com>
tserong
approved these changes
Jun 7, 2024
| fi | ||
| done | ||
|
|
||
| echo "all upgrade addons have matched version with the repo" |
There was a problem hiding this comment.
As we're not failing the build on mismatches per #750 (comment), this line will always be printed. Better to either print a count of mismatches, or maybe just not print this line at all, e.g.:
@@ -180,6 +180,7 @@ check_upgrade_addon_chart_version_matching() {
echo "upgrade addon files"
ls -alht ${harvester_path}/package/upgrade/addons
+ local mismatches=0
for filename in ${harvester_path}/package/upgrade/addons/*.yaml; do
local tmpfile=/tmp/$(basename ${filename})
grep -v "{{" ${filename} > ${tmpfile}
@@ -203,10 +204,13 @@ check_upgrade_addon_chart_version_matching() {
# a new version bumping generally means two PRs
# directly return 1 will cause failure in build
echo WARNING upgrade addon "$chart" has version mis-matching: in repo is "$repover" but in addon is "$version"
+ (( mismatches +=1 ))
fi
done
- echo "all upgrade addons have matched version with the repo"
+ if [[ $mismatches -eq 0 ]]; then
+ echo "all upgrade addons have matched version with the repo"
+ fi
}
check_upgrade_addon_chart_version_matching
brandboat
approved these changes
Jun 12, 2024
Comment on lines
+160
to
+161
| echo WARNING: addon $chart is defined, but the chart is not packed into repo / repo struct is changed | ||
| continue |
There was a problem hiding this comment.
nit: the indention is 1 space instead of 2spaces.
Comment on lines
+166
to
+168
| echo WARNING: addon "$chart" is defined with version "$version" but the chart is not packed into repo in ${ARCH} | ||
| elif [[ $repover != $version ]]; then | ||
| echo addon "$chart" has version mis-matching: in repo is "$repover" but in addon is "$version" |
Comment on lines
+194
to
+195
| echo WARNING: upgrade addon $chart is defined, but the chart is not packed into repo / repo struct is changed | ||
| continue |
Comment on lines
+200
to
+205
| echo WARNING: upgrade addon "$chart" is defined with version "$version" but the chart is not packed into repo in ${ARCH} | ||
| elif [[ $repover != $version ]]; then | ||
| # the upgrade addon is stored in GH harvester; but the chart repo is stored in GH harvester-installer | ||
| # a new version bumping generally means two PRs | ||
| # directly return 1 will cause failure in build | ||
| echo WARNING upgrade addon "$chart" has version mis-matching: in repo is "$repover" but in addon is "$version" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem:
Addon & repo chart version mis-matching (e.g. harvester/harvester#5840)
Solution:
Check version matching in the step of build-bundle
In amd64 architecture, the mismatching will cause build failure
In arm64 architecture, the mismatching will print some WARNING messages but build continue
Related Issue:
harvester/harvester#4937
harvester/harvester#5840
Test plan:
Refer #750 (comment)
This is a manual backport of #750, as the addon upgrade path is changed in master-head.