diff --git a/README.md b/README.md index 153a1ad..7cb2aba 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Developer NOTE: We should automate this configuration. |------|-------------|------|---------|:--------:| | [account\_id](#input\_account\_id) | aws account number | `string` | `""` | no | | [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 | -| [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 |
| [namespace](#input\_namespace) | The namespace into which tempo will be deployed | `string` | `"tempo"` | no |
| [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN in the EKS cluster for the OpenID Connect identity provider. | `string` | n/a | yes |
| [profile](#input\_profile) | AWS config profile used to upload images into ECR | `string` | `""` | no |
diff --git a/copy_images.tf b/copy_images.tf
index 833c076..c764b39 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -1,5 +1,5 @@
locals {
- 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")
tempo_key = format("%v#%v", "tempo", var.tempo_tag)
image_config = [
diff --git a/variables.tf b/variables.tf
index 640cc7f..dc41667 100644
--- a/variables.tf
+++ b/variables.tf
@@ -9,10 +9,20 @@ variable "cluster_name" {
type = string
}
-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 "namespace" {