Makefile: Build OVA packages and include them in repos #1428
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zmrow
commented
Mar 30, 2021
bcressey
reviewed
Mar 31, 2021
|
^ addressed @bcressey 's comments Also updated the commit messages, PR description, and testing done to reflect the changes. |
bcressey
reviewed
Mar 31, 2021
bcressey
reviewed
Mar 31, 2021
This change adds a new `build-ova` target that will build OVA packages for variants that build VMDK images. The OVA packages are named identically to our images and end up in a new directory `build/ovas`. To support the building of OVA packages, a new OVF template is included in `variants/vmware-dev/template.ovf`. When building an OVA package, the current values are substituted into the template and it is included in the final OVA package.
This change updates the `build-archives` target to depend on the `build-ova` target. This ensures that OVAs are built if necessary when building new repos. If the current variant is `vmware-*`, we ensure that the OVA is included in the repository, similar to the way we include `kmod_kit`.
|
^ Removed the SCSI controller and updated the test in the |
webern
approved these changes
Apr 1, 2021
bcressey
approved these changes
Apr 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
Fixes #1415
Description of changes:
OVA packages allow for single file Bottlerocket VM deployment. The OVA includes the disk images for the current Bottlerocket build, an OVF file that defines the makeup of the VM including hardware, and a manifest file that includes the hashes of the previously mentioned artifacts.
The OVA is named just like our other images, signed and included in the Bottlerocket TUF repo alongside our other artifacts:
bottlerocket-vmware-dev-x86_64-1.0.7-a5a8edcc.ovaTesting done:
vmware-devOVA and run it in VMWare (yay!)vmware-devrepo and ensure that the OVA is includedbuild-ovatarget and ensure that we are warned that VMDK artifacts exist but a template does notbuild-ovatarget to ensure it properly exits with an errorbuild-archivesdependency (just to make sure this works) and ensure it fails because there is no OVA.build-ovastep multiple times to ensure it doesn't attempt to rebuild an OVA if the current one is newer than the VMDKstouchthe VMDKs, and re-run thebuild-ovastep to ensure it rebuilds the OVAaws-k8s-1.18image and repo, and ensure that OVAs aren't built or included in the repository (also see that a message is logged that we aren't building an OVA because OVF/VMDK doesn't exist)Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.