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

Update bottlerocket-sdk to v0.46.0 #191

Merged
merged 4 commits into from
Oct 12, 2024

Conversation

ginglis13
Copy link
Contributor

@ginglis13 ginglis13 commented Oct 11, 2024

Issue number:

n/a

Description of changes:

Description of changes:

  • Updates Bottlerocket SDK version to 0.46.0.

Testing done:

  • build kit on aarch64 host
  • build kit on x86_64 host
  • build Bottlerocket with new kit on x86_64 host for aarch64
  • build Bottlerocket with new kit on x86_64 host for x86_64
  • build Bottlerocket with new kit on aarch64 host for aarch64
  • build Bottlerocket with new kit on aarch64 host for x86_64
  • launched a x86 aws-k8s-1.30 instance.
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "e141c066-dirty",
    "pretty_name": "Bottlerocket OS 1.25.0 (aws-k8s-1.30)",
    "variant_id": "aws-k8s-1.30",
    "version_id": "1.25.0"
  }
}

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.

@ginglis13
Copy link
Contributor Author

^ add commit to use new cargo macros from the SDK in os and early-boot-config

@ginglis13 ginglis13 force-pushed the sdk-v0.46.0 branch 2 times, most recently from cafe63a to d098bf6 Compare October 11, 2024 20:20
For netdog, os, and early-boot-config, we must undefine the
cross_check_fips macro; in lieu of a Twoliter release, double undefine
the macro.

Signed-off-by: Gavin Inglis <[email protected]>
@ginglis13
Copy link
Contributor Author

^ rebase to remove temp commit and reference public bottlerocket-sdk:v0.46.0

@ginglis13 ginglis13 marked this pull request as ready for review October 11, 2024 20:21
@ginglis13
Copy link
Contributor Author

CI failing due to clippy lints from the SDK's update to rust 1.81.0. We're using the SDK rust for the check-clippy task: https://github.com/bottlerocket-os/twoliter/blob/929a51756ab06b57e22f67c6bf4f08538ab41487/twoliter/embedded/Makefile.toml#L464

I'm going to disable the CI for this PR to unblock and create an issue to track. We should probably have some static clippy configuration in the core kit to avoid this in the future.

@ginglis13
Copy link
Contributor Author

^ re-enable check-clippy in CI, fix lints via cargo clippy --fix

Manual changes to fix lints in documentation indents, and other manual changes in:

sources/api/apiserver/src/server/exec/child.rs
sources/api/apiserver/src/server/mod.rs
sources/netdog/src/interface_id.rs

@ginglis13
Copy link
Contributor Author

^ some of the autofixes from clippy weren't rustfmt'd 🤦

sources/api/schnauzer/src/helpers/mod.rs Outdated Show resolved Hide resolved
@ginglis13 ginglis13 merged commit dc72afb into bottlerocket-os:develop Oct 12, 2024
2 checks passed
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