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.32 variants boilerplate #4320

Merged
merged 1 commit into from
Jan 4, 2025

Conversation

Sparksssj
Copy link
Contributor

Issue number:

Part of #4318

Description of changes:

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

Testing done:

Draft until a core kit is released that includes bottlerocket-os/bottlerocket-core-kit#298 . 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.32 -e BUILDSYS_ARCH=x86_64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.32 -e BUILDSYS_ARCH=x86_64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.32-nvidia -e BUILDSYS_ARCH=x86_64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.32 -e BUILDSYS_ARCH=aarch64
  • cargo make -e BUILDSYS_VARIANT=aws-k8s-1.32-nvidia -e BUILDSYS_ARCH=aarch64

Launched the aws-k8s-1.32-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.

@vigh-m
Copy link
Contributor

vigh-m commented Jan 2, 2025

So, the new setting being added in PR #4345 is currently set to default to false for all k8s variants. We're splitting this behaviour for k8s 1.31 and below and want this to default to true starting k8s 1.32 onwards.

To support that, we will need a new settings-defaults package for aws-k8s-1.32 and a new sources/shared-defaults/kubernetes-device-ownership-default-true.toml with content similar to below, symlinked into the aws-k8s-1.32 settings-defaults folder:

[settings.kubernetes]
device-ownership-from-security-context = true

[metadata.settings.kubernetes.device-ownership-from-security-context]
affected-services = ["containerd"]

@vigh-m
Copy link
Contributor

vigh-m commented Jan 3, 2025

⬆️ Pushed changes to enable the device-ownership setting for k8s-1.32

@vigh-m vigh-m force-pushed the k8s1.32 branch 2 times, most recently from 81db4b0 to e8d8871 Compare January 4, 2025 00:32
@vigh-m
Copy link
Contributor

vigh-m commented Jan 4, 2025

⬆️ Push after rebase and adding new defaults for -nvidiaand vmware variants

@vigh-m
Copy link
Contributor

vigh-m commented Jan 4, 2025

⬆️ Updated the commit message

@@ -387,7 +390,7 @@ See the ["Capabilities Settings" section in the `settings.oci-defaults.*` refere
##### OCI Defaults: Resource Limits

See the ["Resource Limits Settings" section in the `settings.oci-defaults.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/oci-defaults/).

Copy link
Contributor

Choose a reason for hiding this comment

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

Is this intended?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think so. There is an extra \s on those lines not present elsewhere. Probably got cleaned up by a linter

@Sparksssj Sparksssj merged commit 55051f2 into bottlerocket-os:develop Jan 4, 2025
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.

5 participants