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

Add the ability to output vmdk via qemu-img #1289

Merged
merged 2 commits into from
Jan 29, 2021

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented Jan 22, 2021

Issue number:
N/A

Description of changes:
This change allows users to edit the metadata in a variant's cargo.toml to output an OVA compatible vmdk through buildsys via qemu-img.

Double quotes were also added to several places in rpm2img to prevent unwanted globbing and word splitting (SC2086).

Testing done:

  • Built aws-k8s-1.18 variant with no toml changes and received the standard img.lz4 output.

  • Built aws-k8s-1.18 variant with image-format = "vmdk" added to the toml and received stream-optimized vmdk output for bottlerocket-aws-k8s-1.18-aarch64 and bottlerocket-aws-k8s-1.18-aarch64-data.

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.

Makefile.toml Show resolved Hide resolved
tools/buildsys/src/builder.rs Outdated Show resolved Hide resolved
tools/buildsys/src/manifest.rs Outdated Show resolved Hide resolved
tools/rpm2img Show resolved Hide resolved
tools/buildsys/src/builder.rs Outdated Show resolved Hide resolved
Makefile.toml Show resolved Hide resolved
Makefile.toml Show resolved Hide resolved
tools/rpm2img Outdated Show resolved Hide resolved
tools/rpm2img Outdated Show resolved Hide resolved
Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🍔

tools/rpm2img Outdated Show resolved Hide resolved
Copy link
Contributor

@bcressey bcressey left a comment

Choose a reason for hiding this comment

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

LGTM, just one small concern.

tools/rpm2img Outdated Show resolved Hide resolved
@bcressey bcressey self-requested a review January 29, 2021 05:30
This change allows users to edit the metadata in a variant's cargo.toml
to output a vmdk through buildsys via qemu-img.
Double quotes were added to several places in rpm2img to further prevent
unwanted globbing and word splitting (SC2086).
Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🎖️

@jpculp jpculp merged commit 81da611 into bottlerocket-os:develop Jan 29, 2021
@jpculp jpculp deleted the vmdk-output branch January 29, 2021 22:36
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