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

variants: add k8s-1.31 variants boilerplate #4142

Merged

Conversation

ginglis13
Copy link
Contributor

Issue number:

Part of #4137

Description of changes:

Add the boilerplate for upcoming new k8s-1.31 variants of Bottlerocket.

Testing done:

Draft until a core kit is released that includes bottlerocket-os/bottlerocket-core-kit#81 . Once that core kit is released and Bottlerocket is updated to use it, will rebase this PR and open for review. For testing these changes, I used a custom built bottlerocket-core-kit.

For testing:

  • cargo make -e BUILDSYS_VARIANT=vmware-k8s-1.31 -e BUILDSYS_ARCH=x86_64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.31 -e BUILDSYS_ARCH=x86_64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.31-nvidia -e BUILDSYS_ARCH=x86_64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.31 -e BUILDSYS_ARCH=aarch64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.31-nvidia -e BUILDSYS_ARCH=aarch64

Launched the aws-k8s-1.31-aarch64 variant and ensured it booted and registered w/ k8s cluster.

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.

Add the boilerplate for upcoming new k8s-1.31 variants of Bottlerocket.

Signed-off-by: Gavin Inglis <[email protected]>
@ginglis13 ginglis13 force-pushed the k8s-1.31-boilerplate-variants branch from 85eb881 to 918d69a Compare August 15, 2024 18:05
@ginglis13 ginglis13 marked this pull request as ready for review August 15, 2024 18:29
Copy link
Member

@gthao313 gthao313 left a comment

Choose a reason for hiding this comment

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

💯

Comment on lines +75 to +76
Provides: %{_cross_os}settings-plugin(aws-k8s-1.31)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.31-nvidia)
Copy link
Contributor

Choose a reason for hiding this comment

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

Not a blocker, but this will complicate #4125

@ginglis13 ginglis13 merged commit ddefba0 into bottlerocket-os:develop Aug 20, 2024
32 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.

3 participants