diff --git a/README.md b/README.md index 05a270e..848377e 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ This modules installs the OpenTelemetry Collector operator and two Collectors. O | [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes | | [collector\_contrib\_version](#input\_collector\_contrib\_version) | Which version of collector\_contrib | `string` | `"0.113.0"` | no | | [collector\_version](#input\_collector\_version) | Which version of collector | `string` | `"0.100.0"` | no | -| [eecr\_account\_id](#input\_eecr\_account\_id) | enterpirse ecr source aws account number | `string` | `""` | no | +| [eecr\_info](#input\_eecr\_info) | Enterprise ECR source information |
object({
account_id = string
alias = string
profile = string
region = string
}) | {
"account_id": "269222635945",
"alias": "lab-gov-shared-nonprod",
"profile": "269222635945-lab-gov-shared-nonprod",
"region": "us-gov-east-1"
} | no |
| [loki\_endpoint](#input\_loki\_endpoint) | The internal endpoint for the loki service | `string` | n/a | yes |
| [namespace](#input\_namespace) | Namespace in which to install open telemetry | `string` | `"telemetry"` | no |
| [otel\_helm\_repo](#input\_otel\_helm\_repo) | Helm repo for official opentelemetry | `string` | `"https://open-telemetry.github.io/opentelemetry-helm-charts"` | no |
diff --git a/copy_images.tf b/copy_images.tf
index 6322660..81118dd 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -11,7 +11,7 @@ locals {
collector_contrib_version = var.collector_contrib_version
collector_contrib_key = format("%v#%v", local.collector_contrib_name, local.collector_contrib_version)
- ent_ecr_source = format("%v.%v.%v.%v", var.eecr_account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images")
+ ent_ecr_source = format("%v.%v.%v.%v", var.eecr_info.account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images")
otel_name = "opentelemetry-operator"
otel_version = var.otel_version
diff --git a/variables.tf b/variables.tf
index 32d37a5..e4f1351 100644
--- a/variables.tf
+++ b/variables.tf
@@ -27,10 +27,20 @@ variable "collector_version" {
default = "0.100.0"
}
-variable "eecr_account_id" {
- description = "enterpirse ecr source aws account number"
- type = string
- default = ""
+variable "eecr_info" {
+ description = "Enterprise ECR source information"
+ type = object({
+ account_id = string
+ alias = string
+ profile = string
+ region = string
+ })
+ default = {
+ account_id = "269222635945"
+ alias = "lab-gov-shared-nonprod"
+ profile = "269222635945-lab-gov-shared-nonprod"
+ region = "us-gov-east-1"
+ }
}
variable "loki_endpoint" {