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

Dev kmr #508

Merged
merged 6 commits into from
Jul 1, 2024
Merged

Dev kmr #508

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7077322
add the ability to force engine container images to have their expira…
k-rister Jun 27, 2024
b032d68
only refresh the expiration timestamp if the timestamp is newer than …
k-rister Jun 28, 2024
83f296f
make the quay api url slightly more flexible by removing a hard coded…
k-rister Jun 28, 2024
d6542f5
change the rickshaw-settings.json handling of the refresh-timestamps …
k-rister Jun 29, 2024
586fc94
swap tabs for spaces in rickshaw-settings.json
k-rister Jun 29, 2024
e7ed2a7
change refresh-timestamps to refresh-expiration and move from worksho…
k-rister Jun 29, 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
47 changes: 38 additions & 9 deletions rickshaw-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,20 +1070,49 @@ sub source_container_image {
printf "Processing stage %d (%s)...\n", $x + 1, $workshop_args[$x]{'tag'};
if (defined $workshop_refresh_timestamps_token && defined $workshop_refresh_timestamps_api_url) {
if (remote_image_found($workshop_args[$x]{'tag'})) {
my $refresh_cmd = 'curl --silent' .
' -X PUT -H "Authorization: Bearer ' . $workshop_refresh_timestamps_token . '"' .
' -H "Content-type: application/json" -d \'{ "expiration": ' . $refresh_timestamp . ' }\'' .
' ' . $workshop_refresh_timestamps_api_url . $workshop_args[$x]{'tag'};
my $query_cmd = 'curl --silent' .
' -X GET -H "Authorization: Bearer ' . $workshop_refresh_timestamps_token . '"' .
' "' . $workshop_refresh_timestamps_api_url .
'?limit=1&specificTag=' . $workshop_args[$x]{'tag'} . '"';

($refresh_cmd, my $refresh_status, my $refresh_rc) = run_cmd($refresh_cmd);
chomp($refresh_status);
($query_cmd, my $query_status, my $query_rc) = run_cmd($query_cmd);
chomp($query_status);

if (($refresh_rc == 0) && ($refresh_status eq "\"Updated\"")) {
print "\tRefreshed expiration timestamp\n";
my $current_timestamp;
if ($query_rc == 0) {
my $coder = JSON::XS->new;
my $query_ref = $coder->decode($query_status);

if (defined $$query_ref{'tags'}[0]) {
$current_timestamp = $$query_ref{'tags'}[0]{'end_ts'};
} else {
print "\tTag information returned from query is incomplete\n";
print Dumper $query_ref;
exit 1;
}
} else {
print "\tFailed to refresh expiration timestamp\n";
print "\tFailed to query for tag information\n";
exit 1;
}

if ($current_timestamp >= $refresh_timestamp) {
printf "\tThe current expiration timestamp (%d) is greater than or equal to the refresh timestamp so not refreshing\n", $current_timestamp;
k-rister marked this conversation as resolved.
Show resolved Hide resolved
} else {
my $refresh_cmd = 'curl --silent' .
' -X PUT -H "Authorization: Bearer ' . $workshop_refresh_timestamps_token . '"' .
' -H "Content-type: application/json" -d \'{ "expiration": ' . $refresh_timestamp . ' }\'' .
' ' . $workshop_refresh_timestamps_api_url . $workshop_args[$x]{'tag'};

($refresh_cmd, my $refresh_status, my $refresh_rc) = run_cmd($refresh_cmd);
chomp($refresh_status);

if (($refresh_rc == 0) && ($refresh_status eq "\"Updated\"")) {
print "\tRefreshed expiration timestamp\n";
} else {
print "\tFailed to refresh expiration timestamp\n";
exit 1;
}
}
} else {
print "\tskipping refresh timestamp because remote image does not exist (!!)\n";
}
Expand Down