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

Fix image name collision in Swift #319

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Fix image name collision in Swift #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2ab433
fix: revision name collision bug
clay-lake Dec 18, 2024
7e544c7
ci: automatically update oci/mock-rock/_releases.json, from https://g…
Dec 18, 2024
0334a97
ci: automatically update oci/prometheus/_releases.json, from https://…
Dec 18, 2024
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
14 changes: 7 additions & 7 deletions oci/mock-rock/_releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,31 @@
"1.1-22.04": {
"end-of-life": "2030-05-01T00:00:00Z",
"candidate": {
"target": "987"
"target": "996"
},
"beta": {
"target": "987"
"target": "996"
},
"edge": {
"target": "987"
"target": "996"
}
},
"1-22.04": {
"end-of-life": "2030-05-01T00:00:00Z",
"candidate": {
"target": "987"
"target": "996"
},
"beta": {
"target": "987"
"target": "996"
},
"edge": {
"target": "987"
"target": "996"
}
},
"1.2-22.04": {
"end-of-life": "2030-05-01T00:00:00Z",
"beta": {
"target": "988"
"target": "997"
},
"edge": {
"target": "1.2-22.04_beta"
Expand Down
75 changes: 75 additions & 0 deletions oci/prometheus/_releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,5 +268,80 @@
"edge": {
"target": "2.45-22.04_beta"
}
},
"2.53-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "111"
},
"candidate": {
"target": "2.53-24.04_stable"
},
"beta": {
"target": "2.53-24.04_candidate"
},
"edge": {
"target": "2.53-24.04_beta"
}
},
"2.53.3-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "111"
},
"candidate": {
"target": "2.53.3-24.04_stable"
},
"beta": {
"target": "2.53.3-24.04_candidate"
},
"edge": {
"target": "2.53.3-24.04_beta"
}
},
"2-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "112"
},
"candidate": {
"target": "2-24.04_stable"
},
"beta": {
"target": "2-24.04_candidate"
},
"edge": {
"target": "2-24.04_beta"
}
},
"2.55-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "112"
},
"candidate": {
"target": "2.55-24.04_stable"
},
"beta": {
"target": "2.55-24.04_candidate"
},
"edge": {
"target": "2.55-24.04_beta"
}
},
"2.55.1-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "112"
},
"candidate": {
"target": "2.55.1-24.04_stable"
},
"beta": {
"target": "2.55.1-24.04_candidate"
},
"edge": {
"target": "2.55.1-24.04_beta"
}
}
}
4 changes: 2 additions & 2 deletions src/image/define_image_revision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ set -x

# Does image already exist in Swift?
# If not, then this is immediately revision number 1
swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME | grep $IMAGE_NAME || \
swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME/ | grep $IMAGE_NAME || \
(echo "revision=1" >> "$GITHUB_OUTPUT" && exit 0)

# If the script gets here, then it means this image already has revisions
highest_revision=$(swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME \
highest_revision=$(swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME/ \
| sort -t / -k 3 -V \
| tail -1 \
| awk -F'/' '{print $3}')
Expand Down
2 changes: 1 addition & 1 deletion src/image/get_canonical_tags_from_swift.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source $(dirname $0)/../configs/swift.public.novarc

set -x

canonical_tags=$(swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME \
canonical_tags=$(swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME/ \
| awk -F '/' '{print $2"_"$3}' | uniq | sort | tr '\n' ',')

echo "canonical-tags=${canonical_tags}" >> "$GITHUB_OUTPUT"
Expand Down
2 changes: 1 addition & 1 deletion src/uploads/swift_lockfile_lock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pushd "${staging_area}"
# are waiting for the lockfile to get removed, and they may exit
# the while loop at the same time, getting into a race condition.
while [ $TIMEOUT -gt 0 ]; do
swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME | grep "lockfile.lock" && sleep $SLEEP_TIME || break
swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME/ | grep "lockfile.lock" && sleep $SLEEP_TIME || break
TIMEOUT=$(( $TIMEOUT - $SLEEP_TIME ))
if [ $TIMEOUT -lt 1 ]; then
echo "Timeout reached while waiting to write lockfile into the Swift container for ${IMAGE_NAME}."
Expand Down
2 changes: 1 addition & 1 deletion src/uploads/swift_lockfile_unlock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ IMAGE_NAME=$1
# if it does not, emit an error
# SWIFT_CONTAINER_NAME comes from env
LOCKFILE="${IMAGE_NAME}/lockfile.lock"
swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME | grep "$LOCKFILE" && \
swift list $SWIFT_CONTAINER_NAME -p $IMAGE_NAME/ | grep "$LOCKFILE" && \
(swift delete $SWIFT_CONTAINER_NAME "$LOCKFILE" && echo "Lock file removed successfully.") || \
echo "Lock file does not exist."
14 changes: 7 additions & 7 deletions tools/workflow-engine/charms/temporal-worker/oci_factory/activities/find_images_to_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
import json
import logging
import os
from datetime import datetime, timezone
import requests
import swiftclient
import sys
import tempfile
import time
import yaml
import zipfile
from datetime import datetime, timezone
from fnmatch import fnmatchcase

import requests
import swiftclient
import yaml

if __name__ == "__main__":
logging.basicConfig(stream=sys.stderr, level=logging.INFO)
Expand Down Expand Up @@ -103,11 +104,10 @@ def find_released_revisions(releases_json: dict) -> list:
)

# This is the metadata file we want to get from Swift
build_metadata_file = "build_metadata.json"
# match objects with name <IMAGE_NAME>/<TRACK>/<REVISION>/build_metadata.json
img_objs = list(
filter(
lambda o: o["name"].startswith(image)
and o["name"].endswith(build_metadata_file),
lambda o: fnmatchcase(o["name"], f"{image}/*/*/build_metadata.json"),
swift_oci_factory_objs,
)
)
Expand Down
Loading