upstream eks folder (cloudposse/terraform-aws-components#497)

Author: Benbentwo

src/README.md

@@ -84,7 +84,7 @@ components:
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_alb_controller_ingress_group"></a> [alb\_controller\_ingress\_group](#module\_alb\_controller\_ingress\_group) | cloudposse/stack-config/yaml//modules/remote-state | 0.22.4 |
+| <a name="module_alb-controller-ingress-group"></a> [alb-controller-ingress-group](#module\_alb-controller-ingress-group) | cloudposse/stack-config/yaml//modules/remote-state | 0.22.4 |
 | <a name="module_echo_server"></a> [echo\_server](#module\_echo\_server) | cloudposse/helm-release/aws | 0.5.0 |
 | <a name="module_eks"></a> [eks](#module\_eks) | cloudposse/stack-config/yaml//modules/remote-state | 0.22.4 |
 | <a name="module_iam_roles"></a> [iam\_roles](#module\_iam\_roles) | ../../account-map/modules/iam-roles | n/a |
@@ -108,7 +108,6 @@ components:
 | <a name="input_alb_access_logs_s3_bucket_name"></a> [alb\_access\_logs\_s3\_bucket\_name](#input\_alb\_access\_logs\_s3\_bucket\_name) | The name of the S3 bucket to store the access logs in | `string` | `null` | no |
 | <a name="input_alb_access_logs_s3_bucket_prefix"></a> [alb\_access\_logs\_s3\_bucket\_prefix](#input\_alb\_access\_logs\_s3\_bucket\_prefix) | The prefix to use when storing the access logs | `string` | `"echo-server"` | no |
 | <a name="input_alb_controller_ingress_group_component_name"></a> [alb\_controller\_ingress\_group\_component\_name](#input\_alb\_controller\_ingress\_group\_component\_name) | The name of the alb-controller-ingress-group component | `string` | `"eks/alb-controller-ingress-group"` | no |
-| <a name="input_alb_controller_ingress_group_enabled"></a> [alb\_controller\_ingress\_group\_enabled](#input\_alb\_controller\_ingress\_group\_enabled) | Uses alb-controller-ingress-group component for alb ingress group | `bool` | `false` | no |
 | <a name="input_atomic"></a> [atomic](#input\_atomic) | If set, installation process purges chart on fail. The wait flag will be set automatically if atomic is used. | `bool` | `true` | no |
 | <a name="input_attributes"></a> [attributes](#input\_attributes) | ID element. Additional attributes (e.g. `workers` or `cluster`) to add to `id`,<br>in the order they appear in the list. New attributes are appended to the<br>end of the list. The elements of the list are joined by the `delimiter`<br>and treated as a single ID element. | `list(string)` | `[]` | no |
 | <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | Specify the exact chart version to install. If this is not specified, the latest version is installed. | `string` | `null` | no |
@@ -119,6 +118,7 @@ components:
 | <a name="input_description"></a> [description](#input\_description) | Set release description attribute (visible in the history). | `string` | `null` | no |
 | <a name="input_descriptor_formats"></a> [descriptor\_formats](#input\_descriptor\_formats) | Describe additional descriptors to be output in the `descriptors` output map.<br>Map of maps. Keys are names of descriptors. Values are maps of the form<br>`{<br>   format = string<br>   labels = list(string)<br>}`<br>(Type is `any` so the map values can later be enhanced to provide additional options.)<br>`format` is a Terraform format string to be passed to the `format()` function.<br>`labels` is a list of labels, in order, to pass to `format()` function.<br>Label values will be normalized before being passed to `format()` so they will be<br>identical to how they appear in `id`.<br>Default is `{}` (`descriptors` output will be empty). | `any` | `{}` | no |
 | <a name="input_eks_component_name"></a> [eks\_component\_name](#input\_eks\_component\_name) | The name of the eks component | `string` | `"eks/cluster"` | no |
+| <a name="input_enable_alb_controller_ingress_group"></a> [enable\_alb\_controller\_ingress\_group](#input\_enable\_alb\_controller\_ingress\_group) | Uses alb-controller-ingress-group component for alb ingress group | `bool` | `false` | no |
 | <a name="input_enabled"></a> [enabled](#input\_enabled) | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | ID element. Usually used for region e.g. 'uw2', 'us-west-2', OR role 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no |
 | <a name="input_helm_manifest_experiment_enabled"></a> [helm\_manifest\_experiment\_enabled](#input\_helm\_manifest\_experiment\_enabled) | Enable storing of the rendered manifest for helm\_release so the full diff of what is changing can been seen in the plan | `bool` | `true` | no |

src/main.tf

@@ -4,10 +4,10 @@ locals {
   ingress_alb_enabled   = var.ingress_type == "alb" ? true : false
 
   alb_access_logs_enabled = var.alb_access_logs_enabled && var.alb_access_logs_s3_bucket_name != null && var.alb_access_logs_s3_bucket_name != ""
-  ingress_controller_group_enabled = var.alb_controller_ingress_group_enabled ? [
+  ingress_controller_group_enabled = var.enable_alb_controller_ingress_group ? [
     {
       name  = "ingress.alb.group_name"
-      value = module.alb_controller_ingress_group.outputs.group_name
+      value = module.alb-controller-ingress-group.outputs.group_name
       type  = "auto"
     }
   ] : []

src/remote-state.tf

@@ -7,7 +7,7 @@ module "eks" {
   context = module.this.context
 }
 
-module "alb_controller_ingress_group" {
+module "alb-controller-ingress-group" {
   source  = "cloudposse/stack-config/yaml//modules/remote-state"
   version = "0.22.4"
 

src/variables.tf

@@ -15,7 +15,7 @@ variable "alb_controller_ingress_group_component_name" {
   default     = "eks/alb-controller-ingress-group"
 }
 
-variable "alb_controller_ingress_group_enabled" {
+variable "enable_alb_controller_ingress_group" {
   type        = bool
   description = "Uses alb-controller-ingress-group component for alb ingress group"
   default     = false