Skip to content

Commit 6394e9e

Browse files
authored
1 parent c303f53 commit 6394e9e

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

src/README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ components:
2424
alb-controller:
2525
vars:
2626
enabled: true
27-
name: "alb-controller"
28-
chart: "aws-load-balancer-controller"
29-
chart_repository: "https://aws.github.io/eks-charts"
30-
chart_version: "1.3.3"
31-
create_namespace: true
32-
kubernetes_namespace: "alb-controller"
33-
3427
# You can use `chart_values` to set any other chart options. Treat `chart_values` as the root of the doc.
3528
#
3629
# # For example
@@ -46,14 +39,14 @@ components:
4639
| Name | Version |
4740
|------|---------|
4841
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
49-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
42+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
5043
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.0 |
5144
5245
## Providers
5346
5447
| Name | Version |
5548
|------|---------|
56-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
49+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.0 |
5750
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | n/a |
5851
5952
## Modules
@@ -89,7 +82,7 @@ components:
8982
| <a name="input_create_namespace"></a> [create\_namespace](#input\_create\_namespace) | Create the namespace if it does not yet exist. Defaults to `false`. | `bool` | `null` | no |
9083
| <a name="input_delimiter"></a> [delimiter](#input\_delimiter) | Delimiter to be used between ID elements.<br>Defaults to `-` (hyphen). Set to `""` to use no delimiter at all. | `string` | `null` | no |
9184
| <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 |
92-
| <a name="input_eks_component_name"></a> [eks\_component\_name](#input\_eks\_component\_name) | The name of the eks component | `string` | `"eks/eks"` | no |
85+
| <a name="input_eks_component_name"></a> [eks\_component\_name](#input\_eks\_component\_name) | The name of the eks component | `string` | `"eks/cluster"` | no |
9386
| <a name="input_enabled"></a> [enabled](#input\_enabled) | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
9487
| <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 |
9588
| <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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module "alb_controller" {
2323
repository = var.chart_repository
2424
description = var.chart_description
2525
chart_version = var.chart_version
26-
kubernetes_namespace = local.enabled && var.create_namespace ? join("", kubernetes_namespace.default.*.id) : var.kubernetes_namespace
26+
kubernetes_namespace = join("", kubernetes_namespace.default.*.id)
2727
create_namespace = false
2828
wait = var.wait
2929
atomic = var.atomic

src/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ variable "rbac_enabled" {
8989
variable "eks_component_name" {
9090
type = string
9191
description = "The name of the eks component"
92-
default = "eks/eks"
92+
default = "eks/cluster"
9393
}

src/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 4.0"
7+
version = "~> 4.0"
88
}
99
helm = {
1010
source = "hashicorp/helm"

0 commit comments

Comments
 (0)