Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OSSM-6569] Update images in CSV annotation to latest version #31

Merged
merged 1 commit into from
May 15, 2024
Merged

[OSSM-6569] Update images in CSV annotation to latest version #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ossm/merge_upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ MERGE_STRATEGY=${MERGE_STRATEGY:-"merge"}
MERGE_REPOSITORY=${MERGE_REPOSITORY:-"https://github.com/istio-ecosystem/sail-operator.git"}
MERGE_BRANCH=${MERGE_BRANCH:-"main"}

VERSIONS_YAML_FILE=${VERSIONS_YAML_FILE:-"versions.yaml"}
HELM_VALUES_FILE=${HELM_VALUES_FILE:-"ossm/values.yaml"}

merge() {
git remote add -f -t "$MERGE_BRANCH" upstream "$MERGE_REPOSITORY"
echo "Using branch $MERGE_BRANCH"
Expand All @@ -49,13 +52,22 @@ merge() {
return $?
}

main () {
updateVersionsInOssmValuesYaml() {
latest_version=$(yq '.versions[0].version' < "${VERSIONS_YAML_FILE}")
FilipB marked this conversation as resolved.
Show resolved Hide resolved
minor_version=${latest_version%.*}
latest_version_underscore=${latest_version//./_}
minor_version_underscore=${minor_version//./_}
sed -i -e "s/${minor_version}\.[0-9]\+/${latest_version}/g" -e "s/${minor_version_underscore}_[0-9]\+/${latest_version_underscore}/g" "${HELM_VALUES_FILE}"
}

main () {
if ! merge; then
set -e
echo "Conflicts detected, attempting to run 'make gen' to resolve."
rm -rf bundle/**/*.yaml resources bundle.Dockerfile
updateVersionsInOssmValuesYaml
FilipB marked this conversation as resolved.
Show resolved Hide resolved
FilipB marked this conversation as resolved.
Show resolved Hide resolved
make gen
git add bundle resources chart bundle.Dockerfile
git add bundle resources chart bundle.Dockerfile "$HELM_VALUES_FILE"
git -c "user.name=$GIT_USERNAME" -c "user.email=$GIT_EMAIL" commit --no-edit
fi
}
Expand Down