Merge pull request #96 from dasmeta/DMVP-3463-adot-policy-name-fix

fix(DMVP-3463): Added cluster_name prefix to adot policy name:
dasmeta · Feb 2, 2024 · a865e7e · a865e7e
2 parents dcd85ab + b0ae23a
commit a865e7e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/examples/spot-instance/README.md b/examples/spot-instance/README.md
@@ -12,7 +12,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.67.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.41 |
 
 ## Modules
 

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>    memory_limiter = optional(object(<br>      {<br>        limit_mib      = optional(number, 4000)<br>        check_interval = optional(string, "1s")<br>      }<br>      ), {<br>      limit_mib      = 4000<br>      check_interval = "1s"<br>      }<br>    )<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>  })</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_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>    memory_limiter = optional(object(<br>      {<br>        limit_mib      = optional(number, 1000)<br>        check_interval = optional(string, "1s")<br>      }<br>      ), {<br>      limit_mib      = 1000<br>      check_interval = "1s"<br>      }<br>    )<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>  })</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/role.tf b/modules/adot/role.tf
@@ -31,7 +31,7 @@ POLICY
 }
 
 resource "aws_iam_policy" "adot" {
-  name        = "adot_policy"
+  name        = "${var.cluster_name}-adot_policy"
   path        = "/"
   description = "Adot Policy"
 

diff --git a/modules/adot/tests/basic/README.md b/modules/adot/tests/basic/README.md
@@ -15,7 +15,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.34.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.41 |
 
 ## Modules
 

diff --git a/modules/adot/tests/template_file/README.md b/modules/adot/tests/template_file/README.md
@@ -15,8 +15,8 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.63.0 |
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.9.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.41 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.0 |
 | <a name="provider_test"></a> [test](#provider\_test) | n/a |
 
 ## Modules