Skip to content

Commit

Permalink
fix(DMVP-6702): bring back non used alb ingress/load-balancer variables
Browse files Browse the repository at this point in the history
  • Loading branch information
mrdntgrn committed Feb 11, 2025
1 parent 53dcca7 commit 4cf0c94
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ module "eks" {
| <a name="input_adot_config"></a> [adot\_config](#input\_adot\_config) | accept\_namespace\_regex defines the list of namespaces from which metrics will be exported, and additional\_metrics defines additional metrics to export. | <pre>object({<br> accept_namespace_regex = optional(string, "(default|kube-system)")<br> additional_metrics = optional(list(string), [])<br> log_group_name = optional(string, "adot")<br> log_retention = optional(number, 14)<br> helm_values = optional(any, null)<br> logging_enable = optional(bool, false)<br> resources = optional(object({<br> limit = object({<br> cpu = optional(string, "200m")<br> memory = optional(string, "200Mi")<br> })<br> requests = object({<br> cpu = optional(string, "200m")<br> memory = optional(string, "200Mi")<br> })<br> }), {<br> limit = {<br> cpu = "200m"<br> memory = "200Mi"<br> }<br> requests = {<br> cpu = "200m"<br> memory = "200Mi"<br> }<br> })<br> })</pre> | <pre>{<br> "accept_namespace_regex": "(default|kube-system)",<br> "additional_metrics": [],<br> "helm_values": null,<br> "log_group_name": "adot",<br> "log_retention": 14,<br> "logging_enable": false,<br> "resources": {<br> "limit": {<br> "cpu": "200m",<br> "memory": "200Mi"<br> },<br> "requests": {<br> "cpu": "200m",<br> "memory": "200Mi"<br> }<br> }<br>}</pre> | no |
| <a name="input_adot_version"></a> [adot\_version](#input\_adot\_version) | The version of the AWS Distro for OpenTelemetry addon to use. If not passed it will get compatible version based on cluster\_version | `string` | `null` | no |
| <a name="input_alarms"></a> [alarms](#input\_alarms) | Alarms enabled by default you need set sns topic name for send alarms for customize alarms threshold use custom\_values | <pre>object({<br> enabled = optional(bool, true)<br> sns_topic = string<br> custom_values = optional(any, {})<br> })</pre> | n/a | yes |
| <a name="input_alb_load_balancer_controller"></a> [alb\_load\_balancer\_controller](#input\_alb\_load\_balancer\_controller) | Aws alb ingress/load-balancer controller configs. | <pre>object({<br> enabled = optional(bool, true) # Whether alb ingress/load-balancer controller enabled, note that alb load balancer will be created also when nginx_ingress_controller_config.enabled=true as nginx loadbalancer service needs it<br> enable_waf_for_alb = optional(bool, false) # Enables WAF and WAF V2 addons for ALB<br> configs = optional(any, {}) # allows to pass additional helm chart configs<br> # alb_log_bucket_name = optional(string, "") # The s3 bucket where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability<br> # alb_log_bucket_path = optional(string, "") # The s3 bucket path/folder where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability<br> # send_alb_logs_to_cloudwatch = optional(bool, true) # Whether logs will be pushed to cloudwatch also, TODO: option and its related ability disable, check if we need this ability<br> })</pre> | `{}` | no |
| <a name="input_alb_load_balancer_controller"></a> [alb\_load\_balancer\_controller](#input\_alb\_load\_balancer\_controller) | Aws alb ingress/load-balancer controller configs. | <pre>object({<br> enabled = optional(bool, true) # Whether alb ingress/load-balancer controller enabled, note that alb load balancer will be created also when nginx_ingress_controller_config.enabled=true as nginx loadbalancer service needs it<br> enable_waf_for_alb = optional(bool, false) # Enables WAF and WAF V2 addons for ALB<br> configs = optional(any, {}) # allows to pass additional helm chart configs<br> alb_log_bucket_name = optional(string, "") # The s3 bucket where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability<br> alb_log_bucket_path = optional(string, "") # The s3 bucket path/folder where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability<br> send_alb_logs_to_cloudwatch = optional(bool, true) # Whether logs will be pushed to cloudwatch also, TODO: option and its related ability disable, check if we need this ability<br> })</pre> | `{}` | no |
| <a name="input_api_gateway_resources"></a> [api\_gateway\_resources](#input\_api\_gateway\_resources) | Nested map containing API, Stage, and VPC Link resources | <pre>list(object({<br> namespace = string<br> api = object({<br> name = string<br> protocolType = string<br> })<br> stages = optional(list(object({<br> name = string<br> namespace = string<br> apiRef_name = string<br> stageName = string<br> autoDeploy = bool<br> description = string<br> })))<br> vpc_links = optional(list(object({<br> name = string<br> namespace = string<br> })))<br> }))</pre> | `[]` | no |
| <a name="input_api_gw_deploy_region"></a> [api\_gw\_deploy\_region](#input\_api\_gw\_deploy\_region) | Region in which API gatewat will be configured | `string` | `""` | no |
| <a name="input_autoscaler_image_patch"></a> [autoscaler\_image\_patch](#input\_autoscaler\_image\_patch) | The patch number of autoscaler image | `number` | `0` | no |
Expand Down
12 changes: 6 additions & 6 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ variable "users" {
# ALB-INGRESS-CONTROLLER
variable "alb_load_balancer_controller" {
type = object({
enabled = optional(bool, true) # Whether alb ingress/load-balancer controller enabled, note that alb load balancer will be created also when nginx_ingress_controller_config.enabled=true as nginx loadbalancer service needs it
enable_waf_for_alb = optional(bool, false) # Enables WAF and WAF V2 addons for ALB
configs = optional(any, {}) # allows to pass additional helm chart configs
# alb_log_bucket_name = optional(string, "") # The s3 bucket where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability
# alb_log_bucket_path = optional(string, "") # The s3 bucket path/folder where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability
# send_alb_logs_to_cloudwatch = optional(bool, true) # Whether logs will be pushed to cloudwatch also, TODO: option and its related ability disable, check if we need this ability
enabled = optional(bool, true) # Whether alb ingress/load-balancer controller enabled, note that alb load balancer will be created also when nginx_ingress_controller_config.enabled=true as nginx loadbalancer service needs it
enable_waf_for_alb = optional(bool, false) # Enables WAF and WAF V2 addons for ALB
configs = optional(any, {}) # allows to pass additional helm chart configs
alb_log_bucket_name = optional(string, "") # The s3 bucket where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability
alb_log_bucket_path = optional(string, "") # The s3 bucket path/folder where alb logs will be placed, TODO: option and its related ability disable, check if we need this ability
send_alb_logs_to_cloudwatch = optional(bool, true) # Whether logs will be pushed to cloudwatch also, TODO: option and its related ability disable, check if we need this ability
})
default = {}
description = "Aws alb ingress/load-balancer controller configs."
Expand Down

0 comments on commit 4cf0c94

Please sign in to comment.