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

Refactor away from aws blueprints + add custom vpc_cni #96

Merged
merged 48 commits into from
Mar 23, 2023
Merged

Conversation

zack-is-cool
Copy link
Member

@zack-is-cool zack-is-cool commented Mar 14, 2023

This PR refactors the meat of the EKS cluster and nodes to the upstream aws terraform module - terraform-aws-eks away from blueprints.

The main reason for this is that most of the AWS blueprints functionality is being deprecated, see https://github.com/aws-ia/terraform-aws-eks-blueprints/blob/docs/v5-direction/DIRECTION_v5.md#notable-changes

With this change we are also adding the ability to configure eks native cluster_addons with the ability to configure and deploy eks add-ons before nodegroups are deployed.

Breaking changes to EKS module

Name changes were made to many of the inputs and outputs from the eks module. These were made to have parity with the new upstream module.

Changes to the complete example

Can now deploy eks managed and self managed node groups, but also has the ability to do one or none based on the inputs enable_self_managed_nodegroups and enable_eks_managed_nodegroups and had been refactored to use the new eks module.

Zarf example

This will break the zarf example, the intention is to go back and fix that in another pr and fix all the inputs.

This PR closes #73 and supports #75

@RothAndrew
Copy link
Member

Looks like you are doing updates to the complete-managed-nodegroup and complete-self-managed-nodegroup examples, and adding a new example complete-self-managed-ng-intra-subnets.

My next step after merging #90 was to delete those two existing examples (first complete-managed-nodegroup, then complete-self-managed-nodegroup after the test for "secure mode" is done)

Adding another example on top concerns me, as it looks to be a lot of copy/pasted code again, which is going to negatively affect maintainability.

Understand that this is very much a WIP PR, but want to make sure we aren't moving in opposite directions.

@zack-is-cool
Copy link
Member Author

Yeah I wasn't intending for that folder to make it into main. Just extra scratch space as I worked through some of the new variables and logic while still looking at the old examples

@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool zack-is-cool requested a review from RothAndrew March 22, 2023 16:50
@zack-is-cool
Copy link
Member Author

/test all

@zack-is-cool
Copy link
Member Author

/test all
added some defaults to account for automatically getting current user info for "admin" stuff

RothAndrew
RothAndrew previously approved these changes Mar 22, 2023
.gitignore Outdated Show resolved Hide resolved
@zack-is-cool zack-is-cool requested a review from RothAndrew March 22, 2023 19:47
Copy link
Member

@ntwkninja ntwkninja left a comment

Choose a reason for hiding this comment

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

Security features don't have parity but everything else looks good!

Will update existing EKS security group issue #17 and add others as needed to capture the delta

@RothAndrew RothAndrew merged commit 514347b into main Mar 23, 2023
@RothAndrew RothAndrew deleted the calico_cni branch March 23, 2023 21:27
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.

Change EKS module to conform to EKS Blueprints direction
3 participants