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.

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

feat(al2023): cache and retag pause container #2000

Merged
merged 11 commits into from
Nov 12, 2024

Conversation

ndbaker1
Copy link
Member

@ndbaker1 ndbaker1 commented Oct 8, 2024

Issue #, if available:

Description of changes:

In the past we've added/removed pause container image caching due to various issues with image GC and regional images. here I'm bringing back image caching for AL2023 and retagging the image to remove the association with the image's registry

the new field pause_container_image will be necessary when building AMIs in an environment that cannot hit the configured default ecr uri (in us-west-2)

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Testing Done

See this guide for recommended testing for PRs. Some tests may not apply. Completing tests and providing additional validation steps are not required, but it is recommended and may reduce review time and time to merge.

@ndbaker1 ndbaker1 force-pushed the pause branch 4 times, most recently from 0fb93da to 9580fb5 Compare October 8, 2024 23:57
@cartermckinnon
Copy link
Member

Looks like we can probably use a shared provisioner for the caching logic?

@ndbaker1
Copy link
Member Author

ndbaker1 commented Oct 9, 2024

Looks like we can probably use a shared provisioner for the caching logic?

yea good call, it might require a lot of the same env vars but i prefer the isolation & reuse with different provisioners

@ndbaker1
Copy link
Member Author

ndbaker1 commented Oct 9, 2024

gonna go ahead and sanity check this, i built both distros on local so it should be testable

/ci

Copy link
Contributor

github-actions bot commented Oct 9, 2024

@ndbaker1 roger that! I've dispatched a workflow. 👍

templates/al2/template.json Outdated Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Oct 9, 2024

@ndbaker1 the workflow that you requested has completed. 🎉

AMI variantBuildTest
1.23 / al2success ✅failure ❌
1.23 / al2023success ✅failure ❌
1.24 / al2success ✅success ✅
1.24 / al2023success ✅failure ❌
1.25 / al2success ✅success ✅
1.25 / al2023success ✅failure ❌
1.26 / al2success ✅success ✅
1.26 / al2023success ✅failure ❌
1.27 / al2success ✅success ✅
1.27 / al2023success ✅failure ❌
1.28 / al2success ✅success ✅
1.28 / al2023success ✅failure ❌
1.29 / al2success ✅success ✅
1.29 / al2023success ✅failure ❌
1.30 / al2success ✅success ✅
1.30 / al2023success ✅failure ❌

@ndbaker1
Copy link
Member Author

/ci

Copy link
Contributor

@ndbaker1 roger that! I've dispatched a workflow. 👍

Copy link
Contributor

@ndbaker1 the workflow that you requested has completed. 🎉

AMI variantBuildTest
1.23 / al2023success ✅success ✅
1.24 / al2023success ✅success ✅
1.25 / al2023success ✅success ✅
1.26 / al2023success ✅success ✅
1.27 / al2023success ✅success ✅
1.28 / al2023success ✅success ✅
1.29 / al2023success ✅success ✅
1.30 / al2023success ✅success ✅

@ndbaker1
Copy link
Member Author

oh it only picked up al23 bc of the diff
/ci
+workflow:os_distros al2

Copy link
Contributor

@ndbaker1 roger that! I've dispatched a workflow. 👍

Copy link
Contributor

@ndbaker1 the workflow that you requested has completed. 🎉

AMI variantBuildTest
1.23 / al2success ✅failure ❌
1.24 / al2success ✅success ✅
1.25 / al2success ✅success ✅
1.26 / al2success ✅success ✅
1.27 / al2success ✅success ✅
1.28 / al2success ✅success ✅
1.29 / al2success ✅success ✅
1.30 / al2success ✅success ✅

@ndbaker1
Copy link
Member Author

ndbaker1 commented Oct 10, 2024

ah it wasn't cached for docker, bc thats still supported below 1.25 and default on 1.23 🤦

@ndbaker1 ndbaker1 changed the title feature: cache the pause container as a localhost image feature: cache the pause container as a local image Oct 10, 2024
@ndbaker1
Copy link
Member Author

/ci
+workflow:os_distros al2,al2023

Copy link
Contributor

@ndbaker1 roger that! I've dispatched a workflow. 👍

Copy link
Contributor

@ndbaker1 the workflow that you requested has completed. 🎉

AMI variantBuildTest
1.23 / al2success ✅failure ❌
1.23 / al2023success ✅success ✅
1.24 / al2success ✅success ✅
1.24 / al2023success ✅success ✅
1.25 / al2success ✅success ✅
1.25 / al2023success ✅success ✅
1.26 / al2success ✅success ✅
1.26 / al2023success ✅success ✅
1.27 / al2success ✅success ✅
1.27 / al2023success ✅success ✅
1.28 / al2success ✅success ✅
1.28 / al2023success ✅success ✅
1.29 / al2success ✅success ✅
1.29 / al2023success ✅success ✅
1.30 / al2success ✅success ✅
1.30 / al2023success ✅success ✅

@ndbaker1
Copy link
Member Author

ndbaker1 commented Oct 10, 2024

docker wasn't playing well with the importing the blob exported by ctr, so i just ripped out the related similar steps and ran them separately. not super critical since its a small image and 1.23/1.24 are soon to be EOL. should do the trick 🤞

/ci
+workflow:os_distros al2,al2023

Copy link
Contributor

@ndbaker1 roger that! I've dispatched a workflow. 👍

Copy link
Contributor

@ndbaker1 the workflow that you requested has completed. 🎉

AMI variantBuildTest
1.23 / al2success ✅success ✅
1.23 / al2023success ✅success ✅
1.24 / al2success ✅success ✅
1.24 / al2023success ✅success ✅
1.25 / al2success ✅success ✅
1.25 / al2023success ✅success ✅
1.26 / al2success ✅success ✅
1.26 / al2023success ✅success ✅
1.27 / al2success ✅success ✅
1.27 / al2023success ✅success ✅
1.28 / al2success ✅success ✅
1.28 / al2023success ✅success ✅
1.29 / al2success ✅success ✅
1.29 / al2023success ✅success ✅
1.30 / al2success ✅success ✅
1.30 / al2023success ✅success ✅

@ndbaker1 ndbaker1 marked this pull request as ready for review October 10, 2024 18:47
doc/usage/al2023.md Outdated Show resolved Hide resolved
doc/usage/al2023.md Outdated Show resolved Hide resolved
templates/shared/runtime/bin/cache-pause-container Outdated Show resolved Hide resolved
@ndbaker1 ndbaker1 changed the title feat(al23): cache and retag pause container feat(al2023): cache and retag pause container Oct 21, 2024
@cartermckinnon
Copy link
Member

Sanity check before merge...

/ci

Copy link
Contributor

github-actions bot commented Nov 9, 2024

@cartermckinnon this PR is not currently mergeable, you'll need to rebase it first.

@cartermckinnon
Copy link
Member

Argh sorry @ndbaker1 😭 Can you rebase this when you get a chance?

@ndbaker1
Copy link
Member Author

/ci

Copy link
Contributor

@ndbaker1 roger that! I've dispatched a workflow. 👍

Copy link
Contributor

@ndbaker1 the workflow that you requested has completed. 🎉

AMI variantBuildTest
1.24 / al2023success ✅success ✅
1.25 / al2023success ✅success ✅
1.26 / al2023success ✅success ✅
1.27 / al2023success ✅success ✅
1.28 / al2023success ✅success ✅
1.29 / al2023success ✅success ✅
1.30 / al2023success ✅success ✅
1.31 / al2023success ✅success ✅

@cartermckinnon cartermckinnon merged commit f81d9fa into awslabs:main Nov 12, 2024
10 checks passed
@ndbaker1 ndbaker1 deleted the pause branch November 12, 2024 00:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants