Skip to content

spec, status: Add architecture #1239

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 3, 2025
Merged

spec, status: Add architecture #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/src/fixtures/spec-only-booted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ status:
image:
image: quay.io/centos-bootc/centos-bootc:stream9
transport: registry
architecture: arm64
version: stream9.20240807.0
timestamp: null
imageDigest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38
Expand Down
1 change: 1 addition & 0 deletions lib/src/fixtures/spec-ostree-remote.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ status:
image:
image: quay.io/otherexample/otherimage:latest
transport: registry
architecture: arm64
version: 20231230.1
timestamp: 2023-12-30T16:10:11Z
imageDigest: sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
Expand Down
1 change: 1 addition & 0 deletions lib/src/fixtures/spec-ostree-to-bootc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ status:
image:
image: quay.io/centos-bootc/centos-bootc:stream9
transport: registry
architecture: s390x
version: stream9.20240807.0
timestamp: null
imageDigest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38
Expand Down
2 changes: 2 additions & 0 deletions lib/src/fixtures/spec-staged-booted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ status:
image: quay.io/example/someimage:latest
transport: registry
signature: insecure
architecture: arm64
version: nightly
# This one has nanoseconds, which should be dropped for human consumption
timestamp: 2023-10-14T19:22:15.42Z
Expand All @@ -29,6 +30,7 @@ status:
image: quay.io/example/someimage:latest
transport: registry
signature: insecure
architecture: arm64
version: nightly
timestamp: 2023-09-30T19:22:16Z
imageDigest: sha256:736b359467c9437c1ac915acaae952aad854e07eb4a16a94999a48af08c83c34
Expand Down
2 changes: 2 additions & 0 deletions lib/src/fixtures/spec-staged-rollback.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ status:
image: quay.io/example/someimage:latest
transport: registry
signature: insecure
architecture: s390x
version: nightly
timestamp: 2023-10-14T19:22:15Z
imageDigest: sha256:16dc2b6256b4ff0d2ec18d2dbfb06d117904010c8cf9732cdb022818cf7a7566
Expand All @@ -29,6 +30,7 @@ status:
image: quay.io/example/someimage:latest
transport: registry
signature: insecure
architecture: s390x
version: nightly
timestamp: 2023-09-30T19:22:16Z
imageDigest: sha256:736b359467c9437c1ac915acaae952aad854e07eb4a16a94999a48af08c83c34
Expand Down
2 changes: 2 additions & 0 deletions lib/src/fixtures/spec-v1a1-orig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ status:
version: nightly
timestamp: 2023-10-14T19:22:15Z
imageDigest: sha256:16dc2b6256b4ff0d2ec18d2dbfb06d117904010c8cf9732cdb022818cf7a7566
architecture: amd64
incompatible: false
pinned: false
ostree:
Expand All @@ -31,6 +32,7 @@ status:
version: nightly
timestamp: 2023-09-30T19:22:16Z
imageDigest: sha256:736b359467c9437c1ac915acaae952aad854e07eb4a16a94999a48af08c83c34
architecture: amd64
incompatible: false
pinned: false
ostree:
Expand Down
1 change: 1 addition & 0 deletions lib/src/fixtures/spec-v1a1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ status:
image:
image: quay.io/otherexample/otherimage:latest
transport: registry
architecture: s390x
version: 20231230.1
timestamp: 2023-12-30T16:10:11Z
imageDigest: sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
Expand Down
1 change: 1 addition & 0 deletions lib/src/fixtures/spec-via-local-oci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ status:
image:
image: /var/mnt/osupdate
transport: oci
architecture: amd64
version: stream9.20240807.0
timestamp: null
imageDigest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38
Expand Down
2 changes: 2 additions & 0 deletions lib/src/spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ pub struct ImageStatus {
pub timestamp: Option<chrono::DateTime<chrono::Utc>>,
/// The digest of the fetched image (e.g. sha256:a0...);
pub image_digest: String,
/// The hardware architecture of this image
pub architecture: String,
}

/// A bootable entry
Expand Down
13 changes: 7 additions & 6 deletions lib/src/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,10 @@ fn human_render_imagestatus(
let prefix_len = prefix.chars().count();
writeln!(out, "{prefix}: {imageref}")?;

let arch = image.architecture.as_str();
write_row_name(&mut out, "Digest", prefix_len)?;
let digest = &image.image_digest;
writeln!(out, "{digest}")?;
writeln!(out, "{digest} ({arch})")?;

// Format the timestamp without nanoseconds since those are just irrelevant noise for human
// consumption - that time scale should basically never matter for container builds.
Expand Down Expand Up @@ -477,11 +478,11 @@ mod tests {
.expect("No spec found");
let expected = indoc::indoc! { r"
Staged image: quay.io/example/someimage:latest
Digest: sha256:16dc2b6256b4ff0d2ec18d2dbfb06d117904010c8cf9732cdb022818cf7a7566
Digest: sha256:16dc2b6256b4ff0d2ec18d2dbfb06d117904010c8cf9732cdb022818cf7a7566 (arm64)
Version: nightly (2023-10-14T19:22:15Z)

● Booted image: quay.io/example/someimage:latest
Digest: sha256:736b359467c9437c1ac915acaae952aad854e07eb4a16a94999a48af08c83c34
Digest: sha256:736b359467c9437c1ac915acaae952aad854e07eb4a16a94999a48af08c83c34 (arm64)
Version: nightly (2023-09-30T19:22:16Z)
"};
similar_asserts::assert_eq!(w, expected);
Expand Down Expand Up @@ -511,7 +512,7 @@ mod tests {
.expect("No spec found");
let expected = indoc::indoc! { r"
Staged image: quay.io/centos-bootc/centos-bootc:stream9
Digest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38
Digest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38 (s390x)
Version: stream9.20240807.0

● Booted ostree
Expand All @@ -527,7 +528,7 @@ mod tests {
.expect("No spec found");
let expected = indoc::indoc! { r"
● Booted image: quay.io/centos-bootc/centos-bootc:stream9
Digest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38
Digest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38 (arm64)
Version: stream9.20240807.0
"};
similar_asserts::assert_eq!(w, expected);
Expand All @@ -548,7 +549,7 @@ mod tests {
.unwrap();
let expected = indoc::indoc! { r"
● Booted image: oci:/var/mnt/osupdate
Digest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38
Digest: sha256:47e5ed613a970b6574bfa954ab25bb6e85656552899aa518b5961d9645102b38 (amd64)
Version: stream9.20240807.0
"};
similar_asserts::assert_eq!(w, expected);
Expand Down
2 changes: 2 additions & 0 deletions lib/src/store/ostree_container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ fn create_imagestatus(
.and_then(try_deserialize_timestamp);

let version = ostree_container::version_for_config(config).map(ToOwned::to_owned);
let architecture = config.architecture().to_string();
ImageStatus {
image,
version,
timestamp,
image_digest: manifest_digest.to_string(),
architecture,
}
}

Expand Down