Skip to content

✨ Add AWS Nitro Enclave support to AWSLaunchTemplate#5928

Open
raykrueger wants to merge 1 commit intokubernetes-sigs:mainfrom
raykrueger:feat/nitro-enclave-support
Open

✨ Add AWS Nitro Enclave support to AWSLaunchTemplate#5928
raykrueger wants to merge 1 commit intokubernetes-sigs:mainfrom
raykrueger:feat/nitro-enclave-support

Conversation

@raykrueger
Copy link
Copy Markdown

@raykrueger raykrueger commented Apr 2, 2026

What type of PR is this?

/kind api-change

What this PR does / why we need it:

AWSLaunchTemplate does not expose EnclaveOptions, preventing CAPA users from enabling AWS Nitro Enclaves on managed machine pool nodes. The field is available in the EC2 launch template API but was never wired into the CAPA types or launch template builder.

This adds an EnclaveOptions struct to api/v1beta2 and a corresponding field on AWSLaunchTemplate, mapped through createLaunchTemplateData(), SDKToLaunchTemplate(), and LaunchTemplateNeedsUpdate() — following the same pattern as InstanceMetadataOptions. Nitro Enclaves were called out as a motivating example in the original launch template proposal (docs/proposal/20211210-launch-templates-managedmachinepools.md).

Which issue(s) this PR fixes:
Fixes #5927

Special notes for your reviewer:

EnclaveOptions is a v1beta2-only field. The annotation-based restore pattern in exp/api/v1beta1/conversion.go has been updated for both AWSMachinePool and AWSManagedMachinePool, following the same approach as InstanceMetadataOptions, PrivateDNSName, and other v1beta2-only AWSLaunchTemplate fields.

This PR was developed with AI and my direct supervision.

Checklist:

  • squashed commits
  • includes documentation
  • includes emoji in title
  • adds unit tests
  • adds or updates e2e tests

Release note:

Add `enclaveOptions` field to `AWSLaunchTemplate` to enable AWS Nitro Enclave support on EC2 instances via managed machine pools.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Apr 2, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign dlipovetsky for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Welcome @raykrueger!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 2, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Hi @raykrueger. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 2, 2026
@raykrueger raykrueger force-pushed the feat/nitro-enclave-support branch from d734ce3 to ce8b99b Compare April 2, 2026 22:21
Adds enclaveOptions field to AWSLaunchTemplate, wiring it through the
launch template data builder, SDK reverse-mapping, update detection, and
v1beta1 annotation-based conversion restore. Includes unit tests and
documentation.
@raykrueger raykrueger force-pushed the feat/nitro-enclave-support branch from ce8b99b to 08cbdb9 Compare April 2, 2026 22:39
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add AWS Nitro Enclave support to AWSLaunchTemplate

2 participants