diff --git a/copy_images.tf b/copy_images.tf index b26ad1f..d6e0405 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -1,6 +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.account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images") image_config = [ ## Images for Kiali @@ -8,8 +9,8 @@ locals { enabled = true dest_path = null name = "istio-tools/kiali-operator" - source_image = "kiali/kiali-operator" - source_registry = "quay.io" + source_image = "opensource/kiali/kiali-operator" + source_registry = format("%v/%v", local.ent_ecr_source, "ironbank") source_tag = var.kiali_application_version tag = var.kiali_application_version }, @@ -17,8 +18,8 @@ locals { enabled = true dest_path = null name = "istio-tools/kiali" - source_image = "kiali/kiali" - source_registry = "quay.io" + source_image = "opensource/kiali/kiali" + source_registry = format("%v/%v", local.ent_ecr_source, "ironbank") source_tag = var.kiali_application_version tag = var.kiali_application_version }, @@ -33,7 +34,22 @@ module "images" { image_config = local.image_config tags = {} - enable_lifecycle_policy = true - lifecycle_policy_all = true - force_delete = true + enable_lifecycle_policy = true + lifecycle_policy_all = true + force_delete = true + lifecycle_policy_keep_count = 5 + + source_username = data.aws_ecr_authorization_token.ecr_token.user_name + source_password = data.aws_ecr_authorization_token.ecr_token.password + + destination_username = data.aws_ecr_authorization_token.token.user_name + destination_password = data.aws_ecr_authorization_token.token.password +} + +data "aws_ecr_authorization_token" "ecr_token" { + registry_id = var.account_id +} + +data "aws_ecr_authorization_token" "token" { + registry_id = var.account_id } diff --git a/variables.tf b/variables.tf index 2af2040..56ace1e 100644 --- a/variables.tf +++ b/variables.tf @@ -78,3 +78,15 @@ variable "service_name" { type = string default = "kiali" } + +variable "account_id" { + description = "aws account number" + type = string + default = "" +} + +variable "region" { + description = "region name" + type = string + default = "us-gov-east-1" +}