Skip to content

Commit 5b49171

Browse files
authored
Update echo and alb-controller-ingress-group (cloudposse/terraform-aws-components#547)
1 parent bc2ba53 commit 5b49171

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

src/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ components:
3939
| Name | Version |
4040
|------|---------|
4141
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
42-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
43-
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.12.1 |
42+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
43+
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.7.1 |
4444

4545
## Providers
4646

4747
| Name | Version |
4848
|------|---------|
49-
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.0 |
50-
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | ~> 2.12.1 |
49+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
50+
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.7.1 |
5151

5252
## Modules
5353

@@ -81,6 +81,7 @@ components:
8181
| <a name="input_alb_access_logs_enabled"></a> [alb\_access\_logs\_enabled](#input\_alb\_access\_logs\_enabled) | Whether or not to enable access logs for the ALB | `bool` | `false` | no |
8282
| <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 |
8383
| <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 |
84+
| <a name="input_alb_group_name"></a> [alb\_group\_name](#input\_alb\_group\_name) | The name of the alb group | `string` | `null` | no |
8485
| <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 |
8586
| <a name="input_context"></a> [context](#input\_context) | Single object for setting entire context at once.<br>See description of individual variables for details.<br>Leave string and numeric variables as `null` to use default value.<br>Individual variable settings (non-null) override settings in context object,<br>except for attributes, tags, and additional\_tag\_map, which are merged. | `any` | <pre>{<br> "additional_tag_map": {},<br> "attributes": [],<br> "delimiter": null,<br> "descriptor_formats": {},<br> "enabled": true,<br> "environment": null,<br> "id_length_limit": null,<br> "label_key_case": null,<br> "label_order": [],<br> "label_value_case": null,<br> "labels_as_tags": [<br> "unset"<br> ],<br> "name": null,<br> "namespace": null,<br> "regex_replace_chars": null,<br> "stage": null,<br> "tags": {},<br> "tenant": null<br>}</pre> | no |
8687
| <a name="input_create_namespace"></a> [create\_namespace](#input\_create\_namespace) | Create the namespace if it does not yet exist. Defaults to `false`. | `bool` | `false` | no |

src/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ locals {
2222
global_accelerator.outputs.listener_ids[0]
2323
]
2424

25-
ingress_controller_group_name = module.this.name
25+
ingress_controller_group_name = coalesce(var.alb_group_name, module.this.name)
2626

2727
kube_tags = join(",", [for k, v in module.this.tags : "${k}=${v}"])
2828

src/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,9 @@ variable "fixed_response_vars" {
116116
117117
}
118118
}
119+
120+
variable "alb_group_name" {
121+
type = string
122+
description = "The name of the alb group"
123+
default = null
124+
}

src/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = "~> 4.0"
7+
version = ">= 4.0"
88
}
99
kubernetes = {
1010
source = "hashicorp/kubernetes"
11-
version = "~> 2.12.1"
11+
version = ">= 2.7.1"
1212
}
1313
}
1414
}

0 commit comments

Comments
 (0)