fix(DMVP-3211): Changed adot_config variable

dasmeta · Dec 25, 2023 · d1d316c · d1d316c
1 parent ffe95b0
commit d1d316c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/modules/adot/README.md b/modules/adot/README.md
@@ -75,7 +75,7 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_adot_collector_policy_arns"></a> [adot\_collector\_policy\_arns](#input\_adot\_collector\_policy\_arns) | List of IAM policy ARNs to attach to the ADOT collector service account. | `list(string)` | `[]` | no |
-| <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>  })</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>}</pre> | no |
+| <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 = {<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>  })</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_log_group_name"></a> [adot\_log\_group\_name](#input\_adot\_log\_group\_name) | ADOT log group name | `string` | `"adot_log_group_name"` | no |
 | <a name="input_adot_version"></a> [adot\_version](#input\_adot\_version) | The version of the AWS Distro for OpenTelemetry addon to use. | `string` | `"v0.78.0-eksbuild.1"` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | K8s cluster name. | `string` | n/a | yes |

diff --git a/modules/adot/variables.tf b/modules/adot/variables.tf
@@ -46,6 +46,16 @@ variable "adot_config" {
     log_retention          = optional(number, 14)
     helm_values            = optional(any, null)
     logging_enable         = optional(bool, false)
+    resources = {
+      limit = object({
+        cpu    = optional(string, "200m")
+        memory = optional(string, "200Mi")
+      })
+      requests = object({
+        cpu    = optional(string, "200m")
+        memory = optional(string, "200Mi")
+      })
+    }
   })
   default = {
     accept_namespace_regex = "(default|kube-system)"
@@ -55,6 +65,16 @@ variable "adot_config" {
     logging_enable         = false
     # ADOT helm chart values.yaml, if you don't use variable adot will be deployed with module default values file
     helm_values = null
+    resources = {
+      limit = {
+        cpu    = "200m"
+        memory = "200Mi"
+      }
+      requests = {
+        cpu    = "200m"
+        memory = "200Mi"
+      }
+    }
   }
 }