From 0815af09f3c6aaf54b2a3cbf69169f168f203ebe Mon Sep 17 00:00:00 2001 From: dang0317 Date: Wed, 2 Oct 2024 10:01:02 -0400 Subject: [PATCH] Used key instead of dest_path in filtering images --- .../common-services/cluster-autoscaler/cluster-autoscaler.tf | 2 +- .../full-cluster-tf-upgrade/1.30/common-services/images.tf | 4 ++-- examples/full-cluster-tf-upgrade/1.30/images.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/full-cluster-tf-upgrade/1.30/common-services/cluster-autoscaler/cluster-autoscaler.tf b/examples/full-cluster-tf-upgrade/1.30/common-services/cluster-autoscaler/cluster-autoscaler.tf index f5a2241..ed6fa45 100644 --- a/examples/full-cluster-tf-upgrade/1.30/common-services/cluster-autoscaler/cluster-autoscaler.tf +++ b/examples/full-cluster-tf-upgrade/1.30/common-services/cluster-autoscaler/cluster-autoscaler.tf @@ -38,7 +38,7 @@ module "images_cluster_autoscaler" { profile = var.profile application_list = [] application_name = format("eks/%v", var.cluster_name) - image_config = [for k, v in local.images_settings : v if (v.enabled && v.dest_path == "cluster-autoscaler")] + image_config = [for k, v in local.images_settings : v if (v.enabled && k == "cluster-autoscaler")] force_delete = true enable_lifecycle_policy = true diff --git a/examples/full-cluster-tf-upgrade/1.30/common-services/images.tf b/examples/full-cluster-tf-upgrade/1.30/common-services/images.tf index 2d20d63..ad7c3dd 100644 --- a/examples/full-cluster-tf-upgrade/1.30/common-services/images.tf +++ b/examples/full-cluster-tf-upgrade/1.30/common-services/images.tf @@ -1,9 +1,9 @@ locals { - image_config = [ for k, v in local.images_settings : v if (v.enabled && v.dest_path == null) ] + image_config = [ for k, v in local.images_settings : v if (v.enabled && k != "cluster-autoscaler") ] image_output = { for k, v in module.images.images : v.name => v } charts = { for k, v in local.chart_settings : k => v if try(v.enabled, true) } - images = { for k, v in local.images_settings : k => v if (v.enabled && v.dest_path == null) } + images = { for k, v in local.images_settings : k => v if (v.enabled && k != "cluster-autoscaler") } } module "images" { diff --git a/examples/full-cluster-tf-upgrade/1.30/images.yml b/examples/full-cluster-tf-upgrade/1.30/images.yml index cbe013d..f201704 100644 --- a/examples/full-cluster-tf-upgrade/1.30/images.yml +++ b/examples/full-cluster-tf-upgrade/1.30/images.yml @@ -2,7 +2,7 @@ cluster-autoscaler: documentation: "https://github.com/kubernetes/autoscaler/releases" name: "cluster-autoscaler" image: "registry.k8s.io/autoscaling/cluster-autoscaler" - dest_path: "cluster-autoscaler" + dest_path: null source_registry: "registry.k8s.io" source_image: "autoscaling/cluster-autoscaler" source_tag: null