Build both ARM64 and x86-64 AMIs #355

jsf9k · 2024-07-08T14:56:37Z

🗣 Description

This pull request modifies the Terraform code to

Specify the AMI architecture(s) in a separate filter.
Build both an ARM64 and an x86-64 version of the AMI.

💭 Motivation and context

Specifying the AMI architecture(s) in a separate filter is a bit more efficient and flexible than relying just on the architecture specified in the AMI name.
Building an AMI for each architecture when possible allows us to support AWS Graviton instances.

🧪 Testing

All automated tests pass. I also built staging AMIs with these changes and verified that they functioned as expected.

✅ Pre-approval checklist

This PR has an informative and human-readable title.
Changes are limited to a single goal - eschew scope creep!
All relevant type-of-change labels have been added.
I have read the CONTRIBUTING document.
These code changes follow cisagov code standards.
All new and existing tests pass.
Build a staging AMI with these changes.
Test the staging AMI by deploying it to our COOL staging environment and verifying that it functions as expected.

✅ Pre-merge checklist

Finalize version.
Adjust this repo's list of GitHub Actions checks now that two AMIs are being built via a matrix.

✅ Post-merge checklist

Create a release.

dav3r

LGTM 👍

mcdonnnj

LGTM ✔

dav3r

Two AMIs for the price of one- that's some 🌶️ 💩 !

jsf9k · 2024-07-10T16:33:24Z

@mcdonnnj - Please re-review this PR, as I believe it addresses the concerns you mentioned in cisagov/debian-packer#63.

mcdonnnj

This looks pretty solid to me. Strong work 💪💪💪 I have two small items of feedback for your consideration.

src/packer.pkr.hcl

terraform-post-packer/variables.tf

dav3r

Agreed, splitting the historical AMIs is a better solution. 👍

mcdonnnj

Looking even better! I have one item of feedback (in two places) for your consideration, but otherwise this LGTM ✔ Thanks again for separating the historical AMI configuration.

Note

Please add a PR pre-merge item to adjust the required tests since the build job now uses a matrix.

terraform-post-packer/main.tf

This is more flexible than filtering the architecture just based on the name, particularly since the name filter does not support full-fledged regexes.

This should make the search more efficient.

This will allow us to build both x86-64 and ARM64 versions of our AMI.

In order that the builds should complete as soon as possible, the different architectures are built in parallel.

We want to be able to offer both wherever possible.

Co-authored-by: Nick <[email protected]>

…sions Co-authored-by: Nick <[email protected]>

Also reference issue #369 to consider removing the moved blocks when they are no longer necessary.

Co-authored-by: David Redmin <[email protected]>

jsf9k added improvement This issue or pull request will add or improve functionality, maintainability, or ease of use terraform Pull requests that update Terraform code labels Jul 8, 2024

jsf9k self-assigned this Jul 8, 2024

jsf9k marked this pull request as ready for review July 8, 2024 18:46

jsf9k requested review from dav3r, felddy, jasonodoom and mcdonnnj as code owners July 8, 2024 18:46

jsf9k requested a review from a team July 8, 2024 18:46

dav3r approved these changes Jul 8, 2024

View reviewed changes

dv4harr10 approved these changes Jul 8, 2024

View reviewed changes

jsf9k assigned mcdonnnj Jul 8, 2024

jsf9k changed the title ~~Specify architecture(s) as separate filter~~ Specify architecture(s) as separate filters Jul 8, 2024

mcdonnnj approved these changes Jul 9, 2024

View reviewed changes

mcdonnnj added the kraken 🐙 This pull request is ready to merge during the next Lineage Kraken release label Jul 9, 2024

jsf9k force-pushed the improvement/specify-architectures-as-separate-filter branch from be83a8e to 9a35c4f Compare July 10, 2024 04:55

dav3r approved these changes Jul 10, 2024

View reviewed changes

jsf9k changed the title ~~Specify architecture(s) as separate filters~~ Build both ARM64 and x86-64 AMIs Jul 10, 2024

jsf9k requested review from mcdonnnj and dv4harr10 July 10, 2024 14:11

jsf9k mentioned this pull request Jul 10, 2024

Build the Debian Desktop AMI on a Graviton (ARM64) instance cisagov/debian-packer#63

Closed

10 tasks

dv4harr10 approved these changes Jul 10, 2024

View reviewed changes

jsf9k added version bump This issue or pull request increments the version number github-actions Pull requests that update GitHub Actions code packer Pull requests that update Packer code labels Jul 10, 2024

mcdonnnj approved these changes Jul 11, 2024

View reviewed changes

src/packer.pkr.hcl Outdated Show resolved Hide resolved

terraform-post-packer/variables.tf Outdated Show resolved Hide resolved

jsf9k force-pushed the improvement/specify-architectures-as-separate-filter branch from 89421b1 to e0412e7 Compare July 11, 2024 18:57

jsf9k requested a review from mcdonnnj July 11, 2024 19:25

dav3r approved these changes Jul 12, 2024

View reviewed changes

mcdonnnj approved these changes Aug 7, 2024

View reviewed changes

terraform-post-packer/main.tf Show resolved Hide resolved

terraform-post-packer/main.tf Show resolved Hide resolved

jsf9k mentioned this pull request Aug 9, 2024

Consider removing Terraform moved blocks once they are no longer needed #369

Open

dav3r reviewed Aug 9, 2024

View reviewed changes

terraform-post-packer/main.tf Outdated Show resolved Hide resolved

mcdonnnj approved these changes Aug 11, 2024

View reviewed changes

jsf9k and others added 13 commits August 12, 2024 10:10

Alphabetize filters by name

6041172

Add a filter for the AMI's architecture

89c7e1e

This is more flexible than filtering the architecture just based on the name, particularly since the name filter does not support full-fledged regexes.

Add an architecture filter in the Packer config

d58b660

This should make the search more efficient.

Add an ARM64 source to the Packer configuration

aaeb8bd

This will allow us to build both x86-64 and ARM64 versions of our AMI.

Build both the x86-64 and ARM64 versions of the AMI

2452ca5

In order that the builds should complete as soon as possible, the different architectures are built in parallel.

Update the AMI filter to include both the x86-64 and ARM64 AMIs

8dec775

We want to be able to offer both wherever possible.

Bump version from 1.0.1 to 2.0.0

793b46d

Bump version from 2.0.0 to 2.0.0-rc.1

95dc9a3

Reorder data blocks to match order of source blocks

f6dbbb8

Co-authored-by: Nick <[email protected]>

Create separate resources for ARM64 and x86-64 AMIs and launch permis…

9332c38

…sions Co-authored-by: Nick <[email protected]>

Add moved blocks for renamed resources

18765c6

Add comments to moved blocks to explain the intent

51944d0

Also reference issue #369 to consider removing the moved blocks when they are no longer necessary.

Fix typos (missing spaces)

88528fe

Co-authored-by: David Redmin <[email protected]>

jsf9k force-pushed the improvement/specify-architectures-as-separate-filter branch from e6e6549 to 88528fe Compare August 12, 2024 14:11

Finalize version from 2.0.0-rc.1 to 2.0.0

f161416

jsf9k added this pull request to the merge queue Aug 12, 2024

Merged via the queue into develop with commit d44181d Aug 12, 2024
10 checks passed

jsf9k deleted the improvement/specify-architectures-as-separate-filter branch August 12, 2024 14:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Build both ARM64 and x86-64 AMIs #355

Build both ARM64 and x86-64 AMIs #355

jsf9k commented Jul 8, 2024 •

edited

Loading

dav3r left a comment

mcdonnnj left a comment

dav3r left a comment

jsf9k commented Jul 10, 2024

mcdonnnj left a comment

dav3r left a comment

mcdonnnj left a comment •

edited

Loading

Build both ARM64 and x86-64 AMIs #355

Build both ARM64 and x86-64 AMIs #355

Conversation

jsf9k commented Jul 8, 2024 • edited Loading

🗣 Description

💭 Motivation and context

🧪 Testing

✅ Pre-approval checklist

✅ Pre-merge checklist

✅ Post-merge checklist

dav3r left a comment

Choose a reason for hiding this comment

mcdonnnj left a comment

Choose a reason for hiding this comment

dav3r left a comment

Choose a reason for hiding this comment

jsf9k commented Jul 10, 2024

mcdonnnj left a comment

Choose a reason for hiding this comment

dav3r left a comment

Choose a reason for hiding this comment

mcdonnnj left a comment • edited Loading

Choose a reason for hiding this comment

jsf9k commented Jul 8, 2024 •

edited

Loading

mcdonnnj left a comment •

edited

Loading