Skip to content

feat(eks-v2-alpha): add support for EKS hybrid nodes#36749

Merged
aemada-aws merged 15 commits intomainfrom
hybrid
Feb 6, 2026
Merged

feat(eks-v2-alpha): add support for EKS hybrid nodes#36749
aemada-aws merged 15 commits intomainfrom
hybrid

Conversation

@aemada-aws
Copy link
Contributor

@aemada-aws aemada-aws commented Jan 21, 2026

Issue # (if applicable)

Reason for this change

This change allows users to specify the networking primitives for an EKS Hybrid nodes cluster through L2 constructs.

Description of changes

This PR introduces two new top-level fields called remoteNodeNetworks and remotePodNetworks in the Cluster construct. Together, these allow users to specify the exact CIDRs ranges they want to use for their on-premises nodes and (optionally) pods. The Hybrid nodes feature requires that none of the node and pod CIDRs overlap with each other so I have also added validations for that.

Network utils from EC2 had to be exported so they can be used in eks-v2-alpha, which is in a different package (@aws-cdk/aws-eks-v2-alpha). It cannot be used directly without an export like in eks v1 which is in aws-cdk-lib. Because of that, they are marked as internal.

Similar to #32389

This aligns EKS v2 with v1. I also confirmed it works with EKS auto mode.

Describe any new or updated permissions being added

None

Description of how you validated changes

Integ test deployed

Checklist


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@aws-cdk-automation aws-cdk-automation requested a review from a team January 21, 2026 14:12
@github-actions github-actions bot added the p2 label Jan 21, 2026
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jan 21, 2026
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

(This review is outdated)

@github-actions
Copy link
Contributor

github-actions bot commented Jan 21, 2026

⚠️ Experimental Feature: This security report is currently in experimental phase. Results may include false positives and the rules are being actively refined.
Please try merge from main to avoid findings unrelated to the PR.


TestsPassed ✅SkippedFailed
Security Guardian Results48 ran48 passed
TestResult
No test annotations available

@github-actions
Copy link
Contributor

github-actions bot commented Jan 21, 2026

⚠️ Experimental Feature: This security report is currently in experimental phase. Results may include false positives and the rules are being actively refined.
Please try merge from main to avoid findings unrelated to the PR.


TestsPassed ✅SkippedFailed
Security Guardian Results with resolved templates48 ran48 passed
TestResult
No test annotations available

@aws-cdk-automation aws-cdk-automation dismissed their stale review January 21, 2026 15:31

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@aws-cdk-automation aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jan 21, 2026
@aemada-aws aemada-aws added the pr/needs-integration-tests-deployment Requires the PR to deploy the integration test snapshots. label Jan 28, 2026
@aemada-aws aemada-aws temporarily deployed to deployment-integ-test January 28, 2026 19:10 — with GitHub Actions Inactive
@aemada-aws aemada-aws temporarily deployed to deployment-integ-test January 28, 2026 21:56 — with GitHub Actions Inactive
@aemada-aws aemada-aws temporarily deployed to deployment-integ-test February 5, 2026 11:33 — with GitHub Actions Inactive
@alvazjor alvazjor self-assigned this Feb 5, 2026
/**
* Remote network configuration for hybrid nodes
*/
export interface RemoteNodeNetwork {
Copy link
Contributor

@alvazjor alvazjor Feb 5, 2026

Choose a reason for hiding this comment

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

Why do we need this interface? CDK guidelines recommend flattening over nested structures and this is just an array of strings. Shouldne we just use that directly?
This applies also to RemotePodNetwork

Copy link
Contributor Author

@aemada-aws aemada-aws Feb 5, 2026

Choose a reason for hiding this comment

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

The CFN type accepts a list of remote networks, where each network is a CIDR array so the interface is {cidrs: string[]}[] which is RemoteNodeNetwork[] so flattening to remoteNodeNetworkCidrs: string[] is not equivalent, as you can have multiple networks each with their own CIDR arrays.

Right now EKS/CFN has a limit of 1 network, so we can flatten to remoteNodeNetworkCidrs but if they increase this limit to allow more then one we would need to add a new prop and deprecate this one.

https://docs.aws.amazon.com/AWSCloudFormation/latest/TemplateReference/aws-properties-eks-cluster-remotenetworkconfig.html#aws-properties-eks-cluster-remotenetworkconfig-properties

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, missed that cfn expects the same shape. I guess is ok to keep it like this then

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Feb 5, 2026
@mergify
Copy link
Contributor

mergify bot commented Feb 5, 2026

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify
Copy link
Contributor

mergify bot commented Feb 5, 2026

Merge Queue Status

🚫 The pull request has left the queue (rule: default-squash) at 7163923

This pull request spent 14 hours 26 minutes 9 seconds in the queue, with no time running CI.
The checks were run in-place.

Required conditions to merge

Reason

Pull request #36749 has been merged manually at 48ace56

Hint

You were too fast!

@mergify mergify bot had a problem deploying to deployment-integ-test February 5, 2026 17:41 Failure
@aemada-aws aemada-aws merged commit 48ace56 into main Feb 6, 2026
21 of 24 checks passed
@aemada-aws aemada-aws deleted the hybrid branch February 6, 2026 07:35
@github-actions
Copy link
Contributor

github-actions bot commented Feb 6, 2026

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 6, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

contribution/core This is a PR that came from AWS. p2 pr/needs-integration-tests-deployment Requires the PR to deploy the integration test snapshots.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants