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

Feature/calico cni #140

Merged
merged 38 commits into from
Apr 13, 2023
Merged

Feature/calico cni #140

merged 38 commits into from
Apr 13, 2023

Conversation

zack-is-cool
Copy link
Member

@zack-is-cool zack-is-cool commented Apr 5, 2023

closes #75
resolves #149
resolves #153
resloves #124

Calico and vpc-cni general blueprints

  • Add calico to support network policies
  • Turn on the rest of the blueprints add ons we were using before
  • Fix add compatibility for vpc-cni and calico w/ "ANNOTATE_POD_IP": "true"
  • Simplify cluster_addons input (until we have a need to template it for whatever reason (functions, vars as inputs for the config, etc))
    • This was to have parity with upstream as an input

create_aws_auth_configmap should be a boolean input variable. This logic is flakey and is easier to manage from just setting a boolean.

Setting tags "better" - Added provider tags and ensured tags are applied to child modules in a similar pattern throughout. Use-case for this is to simplify tagging on resources for targeted aws-nuke operations based on either names, or tags if the objects have non-standard identifiers pulled from aws-nuke (i.e security groups, vpcs, ec2 instances, etc).

Other changes

  • changed tenancy to default for the secure test to save $$$
  • update aws provider version

@zack-is-cool zack-is-cool requested a review from a team as a code owner April 5, 2023 20:31
@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
Now with helm not waiting.. maybe no timeout

@zack-is-cool
Copy link
Member Author

/test all
tags?

@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
provider tags are bad with merging/applying other tags

@zack-is-cool
Copy link
Member Author

/test all
RDS timeout 🙄

@zack-is-cool
Copy link
Member Author

/test all

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.

I'm ok with approving this PR once the comment is resolved; however, please try to keep future PRs to a more narrow focus (i.e. doesn't contain several unrelated issues in the same PR). It makes the review much easier when the scope is reduced.

examples/complete/fixtures.secure.tfvars Outdated Show resolved Hide resolved
@zack-is-cool zack-is-cool requested a review from ntwkninja April 13, 2023 15:29
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.

@ntwkninja ntwkninja merged commit e399017 into main Apr 13, 2023
@ntwkninja ntwkninja deleted the feature/calico_cni branch April 13, 2023 21:57
ntwkninja pushed a commit that referenced this pull request Apr 15, 2023
* wip

* wip

* Delete complete-self-managed-nodegroup example since secure mode covers its intent

* wip

* wip

* Change keycloak_enabled back to true

* undo the managed stuff and change keycloak_enabled back to false

* wip

* Update providers to use eks module output instead of data object

* Change keycloak_enabled back to true

* wip

* merge main

* update provider things and cluster_addons var

* remove unnessary complicated logic

* turn addons on

* weird merge caused dupes

* clean comments

* fix auto_scaling_group_names inputs

* fix config

* adding these back in

* rollback all create_aws_auth_configmap logic

* fix calico things

* tags on tags on tags

* helm things

* bump

* make default to save $$$

* unblock?

* make true

* bug :(

* does this even do anything

* Revert "make default to save $$$"

This reverts commit c25b2d4.

---------

Co-authored-by: Andy Roth <[email protected]>
ntwkninja added a commit that referenced this pull request Apr 23, 2023
* add secondary vpc cidr

* Externalize logging bucket and KMS key (#141)

* Feature/calico cni (#140)

* wip

* wip

* Delete complete-self-managed-nodegroup example since secure mode covers its intent

* wip

* wip

* Change keycloak_enabled back to true

* undo the managed stuff and change keycloak_enabled back to false

* wip

* Update providers to use eks module output instead of data object

* Change keycloak_enabled back to true

* wip

* merge main

* update provider things and cluster_addons var

* remove unnessary complicated logic

* turn addons on

* weird merge caused dupes

* clean comments

* fix auto_scaling_group_names inputs

* fix config

* adding these back in

* rollback all create_aws_auth_configmap logic

* fix calico things

* tags on tags on tags

* helm things

* bump

* make default to save $$$

* unblock?

* make true

* bug :(

* does this even do anything

* Revert "make default to save $$$"

This reverts commit c25b2d4.

---------

Co-authored-by: Andy Roth <[email protected]>

* add secondary vpc cidr

* subnet tweak

* one block in a blocks field

* add netpols conf to common.tfvars, add supported elements to README, update supported EKS version

* wip - vpc cni custom networking

* working

* thought I did this already but apparently not

* update eni config

* wip - networking fun

* everything looks right but zarf init is unhappy

* everything looks right but zarf init is unhappy

* add wait for nodegroups (needed for vpc cni sutom networking)

* make var descirptions match

* fix pre-commit

---------

Signed-off-by: Gabe <[email protected]>
Co-authored-by: Andy Roth <[email protected]>
Co-authored-by: Zack A <[email protected]>
Co-authored-by: brian.rexrode <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants