Skip to content

*: support platform variants#640

Merged
cyphar merged 7 commits intoopencontainers:mainfrom
cyphar:platform-variant
Oct 15, 2025
Merged

*: support platform variants#640
cyphar merged 7 commits intoopencontainers:mainfrom
cyphar:platform-variant

Conversation

@cyphar
Copy link
Copy Markdown
Member

@cyphar cyphar commented Oct 15, 2025

Closes #313
Signed-off-by: Aleksa Sarai cyphar@cyphar.com

@cyphar cyphar added this to the 0.6.0 milestone Oct 15, 2025
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Oct 15, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 97.29730% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 72.94%. Comparing base (a058839) to head (0242283).
⚠️ Report is 9 commits behind head on main.

Files with missing lines Patch % Lines
oci/config/convert/runtime.go 93.33% 0 Missing and 1 partial ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #640      +/-   ##
==========================================
+ Coverage   72.89%   72.94%   +0.05%     
==========================================
  Files          71       71              
  Lines        6164     6181      +17     
==========================================
+ Hits         4493     4509      +16     
- Misses       1213     1214       +1     
  Partials      458      458              
Files with missing lines Coverage Δ
cmd/umoci/config.go 72.56% <100.00%> (+0.62%) ⬆️
mutate/mutate.go 72.17% <100.00%> (+0.11%) ⬆️
oci/config/generate/spec.go 96.64% <100.00%> (+0.09%) ⬆️
oci/config/convert/runtime.go 73.52% <93.33%> (+1.22%) ⬆️

... and 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

This applies to both the Go API (breaking) and "umoci config" CLI (with
backward-compatible aliases). The main reason is that now that v1.1 of
the image-spec decided to properly refactor the platform configuration
into a separate structure, it makes sense for us to refer to it that way
in our own APIs.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
These tests were disabled back in 2017 because of image-spec and
runtime-spec changes, but those changes have long since been resolved.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
The image-spec conversion specification requires that config.Labels take
precedence over the auto-generated values from the rest of the
configuration, but our code implmented it the other way around.

While we're at it, don't generate annotations for fields that are
zeroed.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
This is still quite manual, but it does at least provide the necessary
feature for ARM.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
We generally need to specify the variant of the architecture if we are
running on ARM. Rather than reimplementing /proc/cpuinfo parsing, just
use containerd's platform parser since that is the standard thing used
by most container tools.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
@cyphar cyphar merged commit a9a95c4 into opencontainers:main Oct 15, 2025
25 checks passed
@cyphar cyphar deleted the platform-variant branch October 15, 2025 08:43
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.

no variant is set on arm.

2 participants