diff --git a/examples/full-cluster-tf-upgrade/1.30/README.md b/examples/full-cluster-tf-upgrade/1.30/README.md index 8db62eb..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.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. ## 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..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 var.cluster_autoscaler_images : v if v.enabled] + 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 69d411b..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 @@ -1,9 +1,8 @@ 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 && k != "cluster-autoscaler") ] 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) } } 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..f201704 100644 --- a/examples/full-cluster-tf-upgrade/1.30/images.yml +++ b/examples/full-cluster-tf-upgrade/1.30/images.yml @@ -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"