diff --git a/examples/full-cluster-tf-upgrade/1.29/common-services/cluster-autoscaler/cluster-autoscaler.tf b/examples/full-cluster-tf-upgrade/1.29/common-services/cluster-autoscaler/cluster-autoscaler.tf index d171d53..70ba0b0 100644 --- a/examples/full-cluster-tf-upgrade/1.29/common-services/cluster-autoscaler/cluster-autoscaler.tf +++ b/examples/full-cluster-tf-upgrade/1.29/common-services/cluster-autoscaler/cluster-autoscaler.tf @@ -39,6 +39,7 @@ module "images_cluster_autoscaler" { application_list = [] application_name = format("eks/%v", var.cluster_name) image_config = [for k, v in var.cluster_autoscaler_images : v if v.enabled] + force_delete = true tags = merge( local.base_tags, local.common_tags, diff --git a/examples/full-cluster-tf-upgrade/1.29/common-services/copy_image.sh.off b/examples/full-cluster-tf-upgrade/1.29/common-services/copy_image.sh.off deleted file mode 120000 index 889e269..0000000 --- a/examples/full-cluster-tf-upgrade/1.29/common-services/copy_image.sh.off +++ /dev/null @@ -1 +0,0 @@ -../bin/copy_image.sh \ No newline at end of file diff --git a/examples/full-cluster-tf-upgrade/1.29/common-services/copy_images.tf.off b/examples/full-cluster-tf-upgrade/1.29/common-services/copy_images.tf.off deleted file mode 100644 index bce8b1c..0000000 --- a/examples/full-cluster-tf-upgrade/1.29/common-services/copy_images.tf.off +++ /dev/null @@ -1,91 +0,0 @@ -data "aws_ecr_authorization_token" "token" {} - -locals { - account_id = data.aws_caller_identity.current.account_id - repo_parent_name = format("eks/%v", var.cluster_name) - - account_ecr_registry = format("%v.dkr.ecr.%v.amazonaws.com", local.account_id, var.region) - account_ecr = format("%v/%v", local.account_ecr_registry, local.repo_parent_name) - - images = [ - # cert-manager related images: - { - name = "cert-manager-controller" - image = "quay.io/jetstack/cert-manager-controller" - tag = var.cert_manager_controller_tag - enabled = true - }, - { - name = "cluster-autoscaler" - image = "k8s.gcr.io/autoscaling/cluster-autoscaler" - tag = var.cluster_autoscaler_tag - enabled = true - }, - { - name = "metrics-server" - image = "docker.io/bitnami/metrics-server" - tag = var.metrics_server_tag - enabled = true - }, - { - name = "cert-manager-cainjector" - image = "quay.io/jetstack/cert-manager-cainjector" - tag = var.cert_manager_cainjector_tag - enabled = true - }, - { - name = "cert-manager-webhook" - image = "quay.io/jetstack/cert-manager-webhook" - tag = var.cert_manager_webhook_tag - enabled = true - }, - # istio related images: - { - name = "istio/operator" - image = "docker.io/istio/operator" - tag = var.istio_tag - enabled = true - }, - { - name = "istio/pilot" - image = "docker.io/istio/pilot" - tag = var.istio_tag - enabled = true - }, - { - name = "istio/proxyv2" - image = "docker.io/istio/proxyv2" - tag = var.istio_tag - enabled = true - }, - ] - image_repos = { for image in local.images : image.name => format("%v/%v", local.account_ecr, image.name) } - image_map = { for image in local.images : image.name => - merge( - image, - tomap( - { "full_path" = local.image_repos[image.name], - "registry" = local.account_ecr_registry, - "repository" = format("%v/%v", local.repo_parent_name, image.name), } - )) } -} - -resource "null_resource" "copy_images" { - for_each = { for image in local.images : image.name => image if image.enabled } - triggers = { - name = each.key - image = format("%v:%v", each.value.image, each.value.tag) - } - - provisioner "local-exec" { - command = "${path.module}/copy_image.sh" - environment = { - AWS_PROFILE = var.profile - AWS_REGION = local.region - SOURCE_IMAGE = format("%v:%v", each.value.image, each.value.tag) - DESTINATION_IMAGE = format("%v/%v:%v", local.account_ecr, each.value.name, each.value.tag) - DESTINATION_USERNAME = data.aws_ecr_authorization_token.token.user_name - DESTINATION_PASSWORD = data.aws_ecr_authorization_token.token.password - } - } -} diff --git a/examples/full-cluster-tf-upgrade/1.29/common-services/images.tf b/examples/full-cluster-tf-upgrade/1.29/common-services/images.tf index 925c0d5..177e4c0 100644 --- a/examples/full-cluster-tf-upgrade/1.29/common-services/images.tf +++ b/examples/full-cluster-tf-upgrade/1.29/common-services/images.tf @@ -13,6 +13,7 @@ module "images" { application_list = [] application_name = format("eks/%v", var.cluster_name) image_config = local.image_config + force_delete = true tags = merge( local.base_tags, local.common_tags,