feat: Add Keyspaces, CloudWatch, MQ, Organizations, Route 53, Route 5…

…3 Resolver and Secrets Manager Controllers (#72)
aws-ia · Aug 12, 2024 · 17628d0 · 17628d0
1 parent 664aac6
commit 17628d0
Show file tree

Hide file tree

Showing 6 changed files with 932 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,13 @@ module "eks_ack_addons" {
   ecrpublic_token    = "<ecr token>"
 
   # Controllers to enable
+  enable_secretsmanager         = true
+  enable_route53resolver        = true
+  enable_route53                = true
+  enable_organizations          = true
+  enable_mq                     = true
+  enable_cloudwatch             = true
+  enable_keyspaces              = true
   enable_kafka                  = true
   enable_efs                    = true
   enable_ecs                    = true
@@ -83,6 +90,7 @@ Examples codified under the [`examples`](https://github.com/aws-ia/terraform-aws
 | <a name="module_applicationautoscaling"></a> [applicationautoscaling](#module\_applicationautoscaling) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_cloudfront"></a> [cloudfront](#module\_cloudfront) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_cloudtrail"></a> [cloudtrail](#module\_cloudtrail) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
+| <a name="module_cloudwatch"></a> [cloudwatch](#module\_cloudwatch) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_dynamodb"></a> [dynamodb](#module\_dynamodb) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_ec2"></a> [ec2](#module\_ec2) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_ecr"></a> [ecr](#module\_ecr) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
@@ -94,14 +102,20 @@ Examples codified under the [`examples`](https://github.com/aws-ia/terraform-aws
 | <a name="module_eventbridge"></a> [eventbridge](#module\_eventbridge) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_iam"></a> [iam](#module\_iam) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_kafka"></a> [kafka](#module\_kafka) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
+| <a name="module_keyspaces"></a> [keyspaces](#module\_keyspaces) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_kms"></a> [kms](#module\_kms) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_lambda"></a> [lambda](#module\_lambda) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_memorydb"></a> [memorydb](#module\_memorydb) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
+| <a name="module_mq"></a> [mq](#module\_mq) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_opensearchservice"></a> [opensearchservice](#module\_opensearchservice) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
+| <a name="module_organizations"></a> [organizations](#module\_organizations) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_prometheusservice"></a> [prometheusservice](#module\_prometheusservice) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_rds"></a> [rds](#module\_rds) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
+| <a name="module_route53"></a> [route53](#module\_route53) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
+| <a name="module_route53resolver"></a> [route53resolver](#module\_route53resolver) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_s3"></a> [s3](#module\_s3) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_sagemaker"></a> [sagemaker](#module\_sagemaker) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
+| <a name="module_secretsmanager"></a> [secretsmanager](#module\_secretsmanager) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_sfn"></a> [sfn](#module\_sfn) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_sns"></a> [sns](#module\_sns) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
 | <a name="module_sqs"></a> [sqs](#module\_sqs) | aws-ia/eks-blueprints-addon/aws | 1.1.1 |
@@ -140,6 +154,7 @@ Examples codified under the [`examples`](https://github.com/aws-ia/terraform-aws
 | <a name="input_applicationautoscaling"></a> [applicationautoscaling](#input\_applicationautoscaling) | ACK Application Autoscaling Helm Chart config | `any` | `{}` | no |
 | <a name="input_cloudfront"></a> [cloudfront](#input\_cloudfront) | ACK cloudfront Helm Chart config | `any` | `{}` | no |
 | <a name="input_cloudtrail"></a> [cloudtrail](#input\_cloudtrail) | ACK Cloudtrail Helm Chart config | `any` | `{}` | no |
+| <a name="input_cloudwatch"></a> [cloudwatch](#input\_cloudwatch) | ACK CloudWatch Helm Chart config | `any` | `{}` | no |
 | <a name="input_cluster_endpoint"></a> [cluster\_endpoint](#input\_cluster\_endpoint) | Endpoint for your Kubernetes API server | `string` | n/a | yes |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name of the EKS cluster | `string` | n/a | yes |
 | <a name="input_create_delay_dependencies"></a> [create\_delay\_dependencies](#input\_create\_delay\_dependencies) | Dependency attribute which must be resolved before starting the `create_delay_duration` | `list(string)` | `[]` | no |
@@ -160,6 +175,7 @@ Examples codified under the [`examples`](https://github.com/aws-ia/terraform-aws
 | <a name="input_enable_applicationautoscaling"></a> [enable\_applicationautoscaling](#input\_enable\_applicationautoscaling) | Enable ACK Application Autoscaling add-on | `bool` | `false` | no |
 | <a name="input_enable_cloudfront"></a> [enable\_cloudfront](#input\_enable\_cloudfront) | Enable ACK Cloudfront add-on | `bool` | `false` | no |
 | <a name="input_enable_cloudtrail"></a> [enable\_cloudtrail](#input\_enable\_cloudtrail) | Enable ACK Cloudtrail add-on | `bool` | `false` | no |
+| <a name="input_enable_cloudwatch"></a> [enable\_cloudwatch](#input\_enable\_cloudwatch) | Enable ACK CloudWatch add-on | `bool` | `false` | no |
 | <a name="input_enable_dynamodb"></a> [enable\_dynamodb](#input\_enable\_dynamodb) | Enable ACK dynamodb add-on | `bool` | `false` | no |
 | <a name="input_enable_ec2"></a> [enable\_ec2](#input\_enable\_ec2) | Enable ACK ec2 add-on | `bool` | `false` | no |
 | <a name="input_enable_ecr"></a> [enable\_ecr](#input\_enable\_ecr) | Enable ACK ECR add-on | `bool` | `false` | no |
@@ -171,29 +187,41 @@ Examples codified under the [`examples`](https://github.com/aws-ia/terraform-aws
 | <a name="input_enable_eventbridge"></a> [enable\_eventbridge](#input\_enable\_eventbridge) | Enable ACK EventBridge add-on | `bool` | `false` | no |
 | <a name="input_enable_iam"></a> [enable\_iam](#input\_enable\_iam) | Enable ACK iam add-on | `bool` | `false` | no |
 | <a name="input_enable_kafka"></a> [enable\_kafka](#input\_enable\_kafka) | Enable ACK Kafka add-on | `bool` | `false` | no |
+| <a name="input_enable_keyspaces"></a> [enable\_keyspaces](#input\_enable\_keyspaces) | Enable ACK Keyspaces add-on | `bool` | `false` | no |
 | <a name="input_enable_kms"></a> [enable\_kms](#input\_enable\_kms) | Enable ACK kms add-on | `bool` | `false` | no |
 | <a name="input_enable_lambda"></a> [enable\_lambda](#input\_enable\_lambda) | Enable ACK Lambda add-on | `bool` | `false` | no |
 | <a name="input_enable_memorydb"></a> [enable\_memorydb](#input\_enable\_memorydb) | Enable ACK MemoryDB add-on | `bool` | `false` | no |
+| <a name="input_enable_mq"></a> [enable\_mq](#input\_enable\_mq) | Enable ACK MQ add-on | `bool` | `false` | no |
 | <a name="input_enable_opensearchservice"></a> [enable\_opensearchservice](#input\_enable\_opensearchservice) | Enable ACK Opensearch Service add-on | `bool` | `false` | no |
+| <a name="input_enable_organizations"></a> [enable\_organizations](#input\_enable\_organizations) | Enable ACK Organizations add-on | `bool` | `false` | no |
 | <a name="input_enable_prometheusservice"></a> [enable\_prometheusservice](#input\_enable\_prometheusservice) | Enable ACK prometheusservice add-on | `bool` | `false` | no |
 | <a name="input_enable_rds"></a> [enable\_rds](#input\_enable\_rds) | Enable ACK rds add-on | `bool` | `false` | no |
+| <a name="input_enable_route53"></a> [enable\_route53](#input\_enable\_route53) | Enable ACK Route 53 add-on | `bool` | `false` | no |
+| <a name="input_enable_route53resolver"></a> [enable\_route53resolver](#input\_enable\_route53resolver) | Enable ACK Route 53 Resolver add-on | `bool` | `false` | no |
 | <a name="input_enable_s3"></a> [enable\_s3](#input\_enable\_s3) | Enable ACK s3 add-on | `bool` | `false` | no |
 | <a name="input_enable_sagemaker"></a> [enable\_sagemaker](#input\_enable\_sagemaker) | Enable ACK Sagemaker add-on | `bool` | `false` | no |
+| <a name="input_enable_secretsmanager"></a> [enable\_secretsmanager](#input\_enable\_secretsmanager) | Enable ACK Secrets Manager add-on | `bool` | `false` | no |
 | <a name="input_enable_sfn"></a> [enable\_sfn](#input\_enable\_sfn) | Enable ACK step functions add-on | `bool` | `false` | no |
 | <a name="input_enable_sns"></a> [enable\_sns](#input\_enable\_sns) | Enable ACK SNS add-on | `bool` | `false` | no |
 | <a name="input_enable_sqs"></a> [enable\_sqs](#input\_enable\_sqs) | Enable ACK SQS add-on | `bool` | `false` | no |
 | <a name="input_eventbridge"></a> [eventbridge](#input\_eventbridge) | ACK EventBridge Helm Chart config | `any` | `{}` | no |
 | <a name="input_iam"></a> [iam](#input\_iam) | ACK iam Helm Chart config | `any` | `{}` | no |
 | <a name="input_kafka"></a> [kafka](#input\_kafka) | ACK Kafka Helm Chart config | `any` | `{}` | no |
+| <a name="input_keyspaces"></a> [keyspaces](#input\_keyspaces) | ACK Keyspaces Helm Chart config | `any` | `{}` | no |
 | <a name="input_kms"></a> [kms](#input\_kms) | ACK kms Helm Chart config | `any` | `{}` | no |
 | <a name="input_lambda"></a> [lambda](#input\_lambda) | ACK Lambda Helm Chart config | `any` | `{}` | no |
 | <a name="input_memorydb"></a> [memorydb](#input\_memorydb) | ACK MemoryDB Helm Chart config | `any` | `{}` | no |
+| <a name="input_mq"></a> [mq](#input\_mq) | ACK MQ Helm Chart config | `any` | `{}` | no |
 | <a name="input_oidc_provider_arn"></a> [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN of the cluster OIDC Provider | `string` | n/a | yes |
 | <a name="input_opensearchservice"></a> [opensearchservice](#input\_opensearchservice) | ACK Opensearch Service Helm Chart config | `any` | `{}` | no |
+| <a name="input_organizations"></a> [organizations](#input\_organizations) | ACK Organizations Helm Chart config | `any` | `{}` | no |
 | <a name="input_prometheusservice"></a> [prometheusservice](#input\_prometheusservice) | ACK prometheusservice Helm Chart config | `any` | `{}` | no |
 | <a name="input_rds"></a> [rds](#input\_rds) | ACK rds Helm Chart config | `any` | `{}` | no |
+| <a name="input_route53"></a> [route53](#input\_route53) | ACK Route 53 Helm Chart config | `any` | `{}` | no |
+| <a name="input_route53resolver"></a> [route53resolver](#input\_route53resolver) | ACK Route 53 Resolver Helm Chart config | `any` | `{}` | no |
 | <a name="input_s3"></a> [s3](#input\_s3) | ACK s3 Helm Chart config | `any` | `{}` | no |
 | <a name="input_sagemaker"></a> [sagemaker](#input\_sagemaker) | ACK Sagemaker Helm Chart config | `any` | `{}` | no |
+| <a name="input_secretsmanager"></a> [secretsmanager](#input\_secretsmanager) | ACK Secrets Manager Helm Chart config | `any` | `{}` | no |
 | <a name="input_sfn"></a> [sfn](#input\_sfn) | ACK step functions Helm Chart config | `any` | `{}` | no |
 | <a name="input_sns"></a> [sns](#input\_sns) | ACK SNS Helm Chart config | `any` | `{}` | no |
 | <a name="input_sqs"></a> [sqs](#input\_sqs) | ACK SQS Helm Chart config | `any` | `{}` | no |

diff --git a/examples/complete/README.md b/examples/complete/README.md
@@ -1,6 +1,13 @@
 # Complete Example
 
 Configuration in this directory creates an AWS EKS cluster with the following ACK addons:
+- AWS Secrets Manager
+- Amazon Route53Resolver
+- Amazon Route 53
+- Amazon Organizations
+- Amazon MQ
+- Amazon CloudWatch
+- Amazon Keyspaces
 - Amazon Kafka
 - Amazon EFS
 - Amazon ECS
@@ -68,47 +75,54 @@ aws eks --region <REGION> update-kubeconfig --name <CLUSTER_NAME>
 kubectl get pods -A
 
 NAMESPACE     NAME                                            READY   STATUS    RESTARTS   AGE
-ack-system    ack-acm-5697f4c5b4-bpkrg                        1/1     Running   0          10m
-ack-system    ack-apigatewayv2-76d6bbd788-82m2h               1/1     Running   0          9m37s
-ack-system    ack-applicationautoscaling-5fd6c8bf8f-kl4gt     1/1     Running   0          8m58s
-ack-system    ack-cloudfront-544f4887c4-dr6ds                 1/1     Running   0          8m12s
-ack-system    ack-cloudtrail-5dc78b7576-hnk4d                 1/1     Running   0          10m
-ack-system    ack-dynamodb-7f4b47488d-tftpf                   1/1     Running   0          8m37s
-ack-system    ack-ec2-5fbf6f55d9-smb4k                        1/1     Running   0          9m37s
-ack-system    ack-ecr-5b4699f87b-j6kxq                        1/1     Running   0          9m7s
-ack-system    ack-ecs-74d8d67695-dbpth                        1/1     Running   0          10m
-ack-system    ack-efs-7b9f965b96-rpwts                        1/1     Running   0          9m54s
-ack-system    ack-eks-54945d94d4-6stzs                        1/1     Running   0          8m34s
-ack-system    ack-elasticache-5758ff66bd-dwfkh                1/1     Running   0          10m
-ack-system    ack-emrcontainers-74c5d7b8c-bljlk               1/1     Running   0          10m
-ack-system    ack-eventbridge-b76bd85b8-rxgsf                 1/1     Running   0          9m46s
-ack-system    ack-iam-89dd5d6b5-2hzch                         1/1     Running   0          8m24s
-ack-system    ack-kafka-7bd95bd59-pz258                       1/1     Running   0          9m40s
-ack-system    ack-kms-58b89848db-p4w6c                        1/1     Running   0          8m21s
-ack-system    ack-lambda-65bd7fbc8d-529d7                     1/1     Running   0          10m
-ack-system    ack-memorydb-76c988f6dd-phbsc                   1/1     Running   0          8m7s
-ack-system    ack-opensearchservice-7fd9d8c866-fg6h6          1/1     Running   0          8m33s
-ack-system    ack-prometheusservice-6d657cd878-kcdsh          1/1     Running   0          9m58s
-ack-system    ack-rds-7df84bf989-87j4s                        1/1     Running   0          9m31s
-ack-system    ack-s3-6ffc4698c6-kg8vw                         1/1     Running   0          8m28s
-ack-system    ack-sagemaker-74f65d4cb9-dzxng                  1/1     Running   0          8m24s
-ack-system    ack-sfn-6b875794cb-k7dnb                        1/1     Running   0          10m
-ack-system    ack-sns-5c75794dbc-6n42j                        1/1     Running   0          10m
-ack-system    ack-sqs-55dfc46cd6-n6qb8                        1/1     Running   0          10m
-kube-system   aws-load-balancer-controller-84b5bf9c5f-k88tj   1/1     Running   0          10m
-kube-system   aws-load-balancer-controller-84b5bf9c5f-xqczl   1/1     Running   0          10m
-kube-system   aws-node-6kswr                                  2/2     Running   0          8m22s
-kube-system   aws-node-8fkb7                                  2/2     Running   0          8m26s
-kube-system   aws-node-c482x                                  2/2     Running   0          8m18s
-kube-system   coredns-787cb67946-lsxph                        1/1     Running   0          14m
-kube-system   coredns-787cb67946-zbq6s                        1/1     Running   0          14m
-kube-system   eks-pod-identity-agent-6b2bc                    1/1     Running   0          8m39s
-kube-system   eks-pod-identity-agent-b8gh8                    1/1     Running   0          8m39s
-kube-system   eks-pod-identity-agent-cq5kr                    1/1     Running   0          8m39s
-kube-system   kube-proxy-6jn9z                                1/1     Running   0          10m
-kube-system   kube-proxy-6mfvr                                1/1     Running   0          10m
-kube-system   kube-proxy-k4c6w                                1/1     Running   0          10m
-kube-system   metrics-server-7577444cf8-f4vgk                 1/1     Running   0          11m
+ack-system    ack-acm-5697f4c5b4-z48sv                        1/1     Running   0          30m
+ack-system    ack-apigatewayv2-76d6bbd788-pxlv9               1/1     Running   0          27m
+ack-system    ack-applicationautoscaling-5fd6c8bf8f-tjhhq     1/1     Running   0          28m
+ack-system    ack-cloudfront-544f4887c4-cn48r                 1/1     Running   0          27m
+ack-system    ack-cloudtrail-5dc78b7576-jpjd6                 1/1     Running   0          26m
+ack-system    ack-cloudwatch-5b844f47db-cl6ht                 1/1     Running   0          28m
+ack-system    ack-dynamodb-7f4b47488d-kf7gd                   1/1     Running   0          30m
+ack-system    ack-ec2-5fbf6f55d9-qrpj6                        1/1     Running   0          29m
+ack-system    ack-ecr-5b4699f87b-27k4t                        1/1     Running   0          27m
+ack-system    ack-ecs-74d8d67695-tw9fp                        1/1     Running   0          28m
+ack-system    ack-efs-7b9f965b96-htcxj                        1/1     Running   0          28m
+ack-system    ack-eks-54945d94d4-pn25c                        1/1     Running   0          30m
+ack-system    ack-elasticache-5758ff66bd-69w79                1/1     Running   0          29m
+ack-system    ack-emrcontainers-74c5d7b8c-4rpkf               1/1     Running   0          29m
+ack-system    ack-eventbridge-b76bd85b8-cl75j                 1/1     Running   0          30m
+ack-system    ack-iam-89dd5d6b5-4vb82                         1/1     Running   0          28m
+ack-system    ack-kafka-7bd95bd59-25kkb                       1/1     Running   0          28m
+ack-system    ack-keyspaces-6cc9bbc575-klxtw                  1/1     Running   0          26m
+ack-system    ack-kms-58b89848db-wh6wq                        1/1     Running   0          27m
+ack-system    ack-lambda-65bd7fbc8d-8qllw                     1/1     Running   0          27m
+ack-system    ack-memorydb-76c988f6dd-dm22w                   1/1     Running   0          29m
+ack-system    ack-mq-85b69db6c-hdwqg                          1/1     Running   0          26m
+ack-system    ack-opensearchservice-7fd9d8c866-5l6wh          1/1     Running   0          29m
+ack-system    ack-organizations-784c69d659-xcm29              1/1     Running   0          27m
+ack-system    ack-prometheusservice-6d657cd878-q492w          1/1     Running   0          30m
+ack-system    ack-rds-7df84bf989-jmpzh                        1/1     Running   0          26m
+ack-system    ack-route53-5d45dcbf66-lchwf                    1/1     Running   0          27m
+ack-system    ack-route53resolver-696cf68868-znnsv            1/1     Running   0          26m
+ack-system    ack-s3-6ffc4698c6-5sfwg                         1/1     Running   0          30m
+ack-system    ack-sagemaker-74f65d4cb9-tqcnm                  1/1     Running   0          27m
+ack-system    ack-secretsmanager-7974695c58-8p29t             1/1     Running   0          30m
+ack-system    ack-sfn-6b875794cb-fnrz4                        1/1     Running   0          26m
+ack-system    ack-sns-5c75794dbc-5vs5r                        1/1     Running   0          27m
+ack-system    ack-sqs-55dfc46cd6-tgc68                        1/1     Running   0          26m
+kube-system   aws-load-balancer-controller-84b5bf9c5f-wmj6s   1/1     Running   0          28m
+kube-system   aws-load-balancer-controller-84b5bf9c5f-xz5bd   1/1     Running   0          28m
+kube-system   aws-node-48drm                                  2/2     Running   0          26m
+kube-system   aws-node-7jmr4                                  2/2     Running   0          26m
+kube-system   aws-node-dc8tz                                  2/2     Running   0          26m
+kube-system   coredns-787cb67946-69dqt                        1/1     Running   0          33m
+kube-system   coredns-787cb67946-nblvh                        1/1     Running   0          33m
+kube-system   eks-pod-identity-agent-5vflt                    1/1     Running   0          27m
+kube-system   eks-pod-identity-agent-ltjcq                    1/1     Running   0          27m
+kube-system   eks-pod-identity-agent-rb8jn                    1/1     Running   0          27m
+kube-system   kube-proxy-mz99j                                1/1     Running   0          30m
+kube-system   kube-proxy-prj6l                                1/1     Running   0          30m
+kube-system   kube-proxy-rsfsz                                1/1     Running   0          30m
+kube-system   metrics-server-7577444cf8-vj4lt                 1/1     Running   0          31m
 ```
 
 ## Sample Application Deployment