diff --git a/README.md b/README.md index 105d120..d848cb9 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ This module deploys and configures Kiali via its operator and integrates it with | Name | Version | |------|---------| | [aws](#provider\_aws) | 5.94.1 | -| [aws.eecr](#provider\_aws.eecr) | 5.94.1 | | [helm](#provider\_helm) | 2.17.0 | | [null](#provider\_null) | 3.2.3 | @@ -38,7 +37,6 @@ This module deploys and configures Kiali via its operator and integrates it with | [helm_release.kiali_operator](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | | [null_resource.git_version](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource | | [null_resource.module_name](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource | -| [aws_ecr_authorization_token.ecr_token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_authorization_token) | data source | | [aws_ecr_authorization_token.token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_authorization_token) | data source | ## Inputs diff --git a/copy_images.tf b/copy_images.tf index ca6b3f1..3899bbd 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -1,7 +1,7 @@ locals { kiali_operator_key = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version) kiali_server_key = format("%v#%v", "istio-tools/kiali", var.kiali_application_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_account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images") image_config = [ ## Images for Kiali @@ -10,7 +10,7 @@ locals { dest_path = null name = "istio-tools/kiali-operator" source_image = "kiali/kiali-operator" - source_registry = "quay.io" + source_registry = format("%v/%v", local.ent_ecr_source, "ironbank") source_tag = var.kiali_application_version tag = var.kiali_application_version }, @@ -19,7 +19,7 @@ locals { dest_path = null name = "istio-tools/kiali" source_image = "kiali/kiali" - source_registry = "quay.io" + source_registry = format("%v/%v", local.ent_ecr_source, "ironbank") source_tag = var.kiali_application_version tag = var.kiali_application_version }, @@ -46,11 +46,6 @@ module "images" { destination_password = data.aws_ecr_authorization_token.token.password } -data "aws_ecr_authorization_token" "ecr_token" { - provider = aws.eecr - registry_id = var.eecr_account_id -} - data "aws_ecr_authorization_token" "token" { registry_id = var.account_id }