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

rpm2img: move OVA generation to imghelper #219

Merged
merged 1 commit into from
May 15, 2024

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented May 15, 2024

Description of changes:

Relocates code-block that created the OVA to imghelper. Small changes include localizing of variables and adding || exit 1 to pushd/popd since imghelper doesn't assume set -e is set in the calling script.

Testing done:

  • Built and smoke tested vmware-k8s-1.28.

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.

@jpculp jpculp requested review from bcressey and rpkelly May 15, 2024 20:59
local ovf_template uefi_secure_boot sbkeys output_dir
ovf_template="${5:?}"
uefi_secure_boot="${6:?}"
sbkeys="${7:?}"
Copy link
Member Author

@jpculp jpculp May 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sbkeys will eventually be a constant in imghelper, but I'll switch this when the secure boot code moves over.

@jpculp jpculp merged commit 17904d1 into bottlerocket-os:develop May 15, 2024
1 check passed
@jpculp jpculp deleted the generate-ova branch May 15, 2024 23:49
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.

4 participants