Crossplane Addon - Part1 #226

vara-bonthu · 2022-02-03T09:55:03Z

What does this PR do?

Deploys Crossplane Add-on to EKS Cluster
Docs added
Example added

Please note that this is a part1 of Crossplane PR. The next PR will include the configuration related to AWS Provider and some sample deployments

Motivation

More

Yes, I have tested the PR using my local account setup (Provide any test evidence report under Additional Notes)
Yes, I have added a new example under examples to support my PR
Yes, I have updated the docs for this feature
Yes, I ran pre-commit run -a with this PR

Note: Not all the PRs required examples and docs except a new pattern or add-on added.

For Moderators

E2E Test successfully complete before merge?

Additional Notes

…or-for-terraform into crossplane

kcoleman731

Awesome work.

kcoleman731 · 2022-02-03T17:18:12Z

docs/add-ons/crossplane.md

+  crossplane_irsa_policies = [] # Optional to add additional policies to Crossplane IRSA
+```
+
+Here is a full example to consume `kubernetes-addons` module and deploy Crossplane


To be concise, might be easiest to just link to the example here?

kcoleman731 · 2022-02-03T17:19:55Z

modules/kubernetes-addons/crossplane/locals.tf

@@ -0,0 +1,39 @@
+locals {
+  name                 = "crossplane-system"


should we call this var namespace? Since it is used for namespace values? Maybe need a name and a namespace var?

You are right. Changed it now

kcoleman731 · 2022-02-03T17:20:42Z

modules/kubernetes-addons/crossplane/locals.tf

@@ -0,0 +1,39 @@
+locals {
+  name                 = "crossplane-system"
+  service_account_name = "crossplane"


service account name is the same as values on line 5 and 6. Prob can reword vars. Also convention in the codebase is to use the -sa postfix for namespaces yea?

Crossplane doesn't provide option to create our own SA. I just removed the reference. SA will be created by Helm chart.

kcoleman731 · 2022-02-03T17:21:13Z

modules/kubernetes-addons/crossplane/main.tf

@@ -0,0 +1,6 @@
+module "helm_addon" {


kcoleman731 · 2022-02-03T17:21:51Z

modules/kubernetes-addons/crossplane/main.tf

@@ -0,0 +1,6 @@
+module "helm_addon" {


I think you need to add the "short license" file header to these files. @jomcy-amzn ?

No I don't think we need them. Repos like https://github.com/aws-ia/terraform-aws-control_tower_account_factory have not included license files in the source files. Root level is good enough.

kcoleman731 · 2022-02-03T17:22:12Z

modules/kubernetes-addons/karpenter/locals.tf

@@ -1,6 +1,6 @@
 locals {
  namespace            = "karpenter"
-  service_account_name = "karpenter-sa"


why changing?

I know we did discuss this but it may be worth revisiting again. we don't need to tell namespace as -ns and service account as -sa. We are tagging the resources with SSP so we should be able to identify the resources created by SSP.

Also, we may avoid creating Service Accounts where possible and let the Helm chart handle that to avoid any possible issues. This also helps for ArgoCD sync.

kcoleman731 · 2022-02-03T17:22:42Z

examples/crossplane/main.tf

+
+  enable_crossplane = true
+
+  crossplane_helm_config = {


these are default values right? Why include in the example?

Changed the example to enable_crossplane = true and commented the optional one.

I think this is one common question that many asked on how to pass their own values.yaml using our repo for the add-ons. Showing this in the example itself will be useful for users. They don't need to go through all the docs.

kcoleman731 · 2022-02-03T17:22:54Z

examples/crossplane/values.yaml

@@ -0,0 +1,5 @@
+nodeSelector:


same as default yaml right? Why include in example?

see above response

askulkarni2

Looking good, need a PR in the addons repo as well.

askulkarni2 · 2022-02-04T05:02:08Z

examples/crossplane/main.tf

+# Example to consume aws-eks-accelerator-for-terraform module
+#---------------------------------------------------------------
+module "aws-eks-accelerator-for-terraform" {
+  source = "github.com/aws-samples/aws-eks-accelerator-for-terraform"


We've been doing relative paths for modules, might want to keep doing that for consistency.

askulkarni2 · 2022-02-04T05:03:13Z

modules/kubernetes-addons/argo-rollouts/main.tf

@@ -1,7 +1,7 @@
 module "helm_addon" {
-  source            = "../helm_addon"
+  source            = "../helm-addon"


askulkarni2 · 2022-02-04T05:07:45Z

modules/kubernetes-addons/crossplane/main.tf

@@ -0,0 +1,6 @@
+module "helm_addon" {


No I don't think we need them. Repos like https://github.com/aws-ia/terraform-aws-control_tower_account_factory have not included license files in the source files. Root level is good enough.

askulkarni2 · 2022-02-04T05:13:03Z

modules/kubernetes-addons/main.tf

+  count             = var.enable_argo_rollouts ? 1 : 0
+  source            = "./argo-rollouts"
+  eks_cluster_id    = var.eks_cluster_id
+  helm_config       = var.argo_rollouts_helm_config


Can you please pass tags here? I forgot to add them in my PR.

…or-for-terraform into crossplane

kcoleman731

Awesome work.

add homepage and introduction video

vara-bonthu and others added 4 commits February 3, 2022 09:51

Crossplane Addon

43f7598

terraform-docs: automated action

948d973

Crosplane module variables added

a253d64

Merge branch 'crossplane' of github.com:aws-samples/aws-eks-accelerat…

c7dca16

…or-for-terraform into crossplane

vara-bonthu requested review from askulkarni2 and kcoleman731 February 3, 2022 10:27

vara-bonthu added documentation Improvements or additions to documentation enhancement New feature or request examples labels Feb 3, 2022

kcoleman731 reviewed Feb 3, 2022

View reviewed changes

askulkarni2 reviewed Feb 4, 2022

View reviewed changes

vara-bonthu and others added 6 commits February 4, 2022 14:28

crossplane pr updates

dc4311b

precommit format update

77e9007

terraform-docs: automated action

8624050

crossplane namespace resoure added

ee419eb

Merge branch 'crossplane' of github.com:aws-samples/aws-eks-accelerat…

5b80e98

…or-for-terraform into crossplane

terraform-docs: automated action

1ba6c24

vara-bonthu requested review from kcoleman731 and askulkarni2 February 4, 2022 15:30

vara-bonthu self-assigned this Feb 4, 2022

askulkarni2 approved these changes Feb 4, 2022

View reviewed changes

kcoleman731 approved these changes Feb 5, 2022

View reviewed changes

kcoleman731 merged commit eb51417 into main Feb 5, 2022

vara-bonthu deleted the crossplane branch February 5, 2022 11:20

alidonmez pushed a commit to alidonmez/terraform-aws-eks-blueprints-1 that referenced this pull request Mar 25, 2023

Merge pull request aws-ia#226 from aws-samples/homepage-video

6af49c4

add homepage and introduction video

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Crossplane Addon - Part1 #226

Crossplane Addon - Part1 #226

vara-bonthu commented Feb 3, 2022 •

edited

Loading

kcoleman731 left a comment

kcoleman731 Feb 3, 2022

vara-bonthu Feb 3, 2022

kcoleman731 Feb 3, 2022

vara-bonthu Feb 3, 2022

kcoleman731 Feb 3, 2022

vara-bonthu Feb 3, 2022 •

edited

Loading

kcoleman731 Feb 3, 2022

kcoleman731 Feb 3, 2022

askulkarni2 Feb 4, 2022

kcoleman731 Feb 5, 2022

kcoleman731 Feb 3, 2022

vara-bonthu Feb 3, 2022 •

edited

Loading

kcoleman731 Feb 3, 2022

vara-bonthu Feb 3, 2022 •

edited

Loading

kcoleman731 Feb 3, 2022

vara-bonthu Feb 3, 2022 •

edited

Loading

askulkarni2 left a comment

askulkarni2 Feb 4, 2022

vara-bonthu Feb 4, 2022

askulkarni2 Feb 4, 2022

askulkarni2 Feb 4, 2022

askulkarni2 Feb 4, 2022

vara-bonthu Feb 4, 2022

kcoleman731 left a comment

Crossplane Addon - Part1 #226

Crossplane Addon - Part1 #226

Conversation

vara-bonthu commented Feb 3, 2022 • edited Loading

What does this PR do?

Motivation

More

For Moderators

Additional Notes

kcoleman731 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vara-bonthu Feb 3, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vara-bonthu Feb 3, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vara-bonthu Feb 3, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vara-bonthu Feb 3, 2022 • edited Loading

Choose a reason for hiding this comment

askulkarni2 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kcoleman731 left a comment

Choose a reason for hiding this comment

vara-bonthu commented Feb 3, 2022 •

edited

Loading

vara-bonthu Feb 3, 2022 •

edited

Loading

vara-bonthu Feb 3, 2022 •

edited

Loading

vara-bonthu Feb 3, 2022 •

edited

Loading

vara-bonthu Feb 3, 2022 •

edited

Loading