From 17ffd9e474e62c3c783aae39ab3ca290ee4cac97 Mon Sep 17 00:00:00 2001 From: dang0317 Date: Wed, 2 Oct 2024 09:07:27 -0400 Subject: [PATCH 1/4] Fixed common-service filtering correct images --- examples/full-cluster-tf-upgrade/1.30/README.md | 4 ++-- .../cluster-autoscaler/cluster-autoscaler.tf | 2 +- .../full-cluster-tf-upgrade/1.30/common-services/images.tf | 6 +++--- examples/full-cluster-tf-upgrade/1.30/images.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/full-cluster-tf-upgrade/1.30/README.md b/examples/full-cluster-tf-upgrade/1.30/README.md index 8db62eb..f06402d 100644 --- a/examples/full-cluster-tf-upgrade/1.30/README.md +++ b/examples/full-cluster-tf-upgrade/1.30/README.md @@ -1,6 +1,6 @@ -# EKS Full Cluster Example 1.28 +# EKS Full Cluster Example 1.30 -This is for deploying an EKS cluster with 1.28. This is revision of 1.28 example, so it is in beta mode. +This is for deploying an EKS cluster with 1.30. This is revision of 1.29 example, so it is in beta mode. ## About 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 4260af9..f5a2241 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 var.cluster_autoscaler_images : v if v.enabled] + image_config = [for k, v in local.images_settings : v if (v.enabled && v.dest_path == "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 69d411b..2d20d63 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 var.image_details : v if v.enabled] + image_config = [ for k, v in local.images_settings : v if (v.enabled && v.dest_path == null) ] image_output = { for k, v in module.images.images : v.name => v } - charts = { for k, v in var.chart_details : k => v if try(v.enabled, true) } - images = { for k, v in var.image_details : k => v if v.enabled } + 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) } } 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 a92cb00..cbe013d 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: null + dest_path: "cluster-autoscaler" source_registry: "registry.k8s.io" source_image: "autoscaling/cluster-autoscaler" source_tag: null @@ -47,7 +47,7 @@ cert-manager-ctl: source_image: "jetstack/cert-manager-ctl" source_tag: null enabled: true - tag: "v1.15.3" + tag: "v1.14.7" metrics-server: documentation: "https://hub.docker.com/r/bitnami/metrics-server/tags" name: "metrics-server" From 0815af09f3c6aaf54b2a3cbf69169f168f203ebe Mon Sep 17 00:00:00 2001 From: dang0317 Date: Wed, 2 Oct 2024 10:01:02 -0400 Subject: [PATCH 2/4] 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 From 77fb67faebde055351bfa0cc5dc295e7feb205ad Mon Sep 17 00:00:00 2001 From: dang0317 Date: Wed, 2 Oct 2024 10:05:02 -0400 Subject: [PATCH 3/4] Removed local.images in common-services --- examples/full-cluster-tf-upgrade/1.30/common-services/images.tf | 1 - 1 file changed, 1 deletion(-) 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 ad7c3dd..317c3a4 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 @@ -3,7 +3,6 @@ locals { 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 && k != "cluster-autoscaler") } } module "images" { From 8cfd780db7c8dd6f0c5a9f55d51a89b72ac6f4d1 Mon Sep 17 00:00:00 2001 From: dang0317 Date: Wed, 2 Oct 2024 10:23:27 -0400 Subject: [PATCH 4/4] Removed beta verbiage from readme --- examples/full-cluster-tf-upgrade/1.30/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/full-cluster-tf-upgrade/1.30/README.md b/examples/full-cluster-tf-upgrade/1.30/README.md index f06402d..603fd80 100644 --- a/examples/full-cluster-tf-upgrade/1.30/README.md +++ b/examples/full-cluster-tf-upgrade/1.30/README.md @@ -1,6 +1,6 @@ # EKS Full Cluster Example 1.30 -This is for deploying an EKS cluster with 1.30. This is revision of 1.29 example, so it is in beta mode. +This is for deploying an EKS cluster with 1.30. ## About