@@ -82,18 +82,16 @@ locals {
8282 # enable_vpa = true
8383 # enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
8484 }
85- addons = merge (local. aws_addons , local. oss_addons )
85+ addons = merge (local. aws_addons , local. oss_addons , {kubernetes_version = local.cluster_version} )
8686
8787 addons_metadata = merge (
8888 module. eks_blueprints_addons . gitops_metadata ,
8989 {
9090 aws_cluster_name = module.eks.cluster_name
9191 aws_region = local.region
9292 aws_account_id = data.aws_caller_identity.current.account_id
93+ aws_vpc_id = module.vpc.vpc_id # Required when enabling addon aws_gateway_api_controller
9394 },
94- try (local. aws_addons . enable_aws_gateway_api_controller , false ) ? {aws_vpc_id = module.vpc.vpc_id} : {}, # Required when enabling addon aws_gateway_api_controller
95- try (local. aws_addons . enable_karpenter , false ) ? {karpenter_cluster_endpoint = module.eks.cluster_endpoint} : {}, # Required when enabling addon karpeneter
96- try (local. aws_addons . enable_cluster_autoscaler , false ) ? {cluster_autoscaler_image_tag = local.cluster_autoscaler_image_tag_selected} : {}, # Required when enabling addon cluster_autoscaler
9795 try (local. aws_addons . enable_velero , false ) ? {
9896 velero_backup_s3_bucket_prefix = try (local. velero_backup_s3_bucket_prefix ," " )
9997 velero_backup_s3_bucket_name = try (local. velero_backup_s3_bucket_name ," " ) } : {} # Required when enabling addon velero
@@ -112,7 +110,6 @@ locals {
112110 GithubRepo = " github.com/csantanapr/terraform-gitops-bridge"
113111 }
114112
115- create_velero_bucket = true
116113 velero_backup_s3_bucket = try (split (" :" , module. velero_backup_s3_bucket . s3_bucket_arn ), [])
117114 velero_backup_s3_bucket_name = try (local. velero_backup_s3_bucket [5 ], " " )
118115 velero_backup_s3_bucket_prefix = " backups"
@@ -252,34 +249,14 @@ module "vpc" {
252249 tags = local. tags
253250}
254251
255- # ###############################################################################
256- # Cluster Autoscaler
257- # ###############################################################################
258-
259- locals {
260- cluster_autoscaler_image_tag_selected = try (local. cluster_autoscaler_image_tag [local . cluster_version ], " v${ local . cluster_version } .0" )
261-
262- # Lookup map to pull latest cluster-autoscaler patch version given the cluster version
263- cluster_autoscaler_image_tag = {
264- " 1.20" = " v1.20.3"
265- " 1.21" = " v1.21.3"
266- " 1.22" = " v1.22.3"
267- " 1.23" = " v1.23.1"
268- " 1.24" = " v1.24.3"
269- " 1.25" = " v1.25.3"
270- " 1.26" = " v1.26.4"
271- " 1.27" = " v1.27.3"
272- }
273- }
274-
275252# ###############################################################################
276253# Velero
277254# ###############################################################################
278255module "velero_backup_s3_bucket" {
279256 source = " terraform-aws-modules/s3-bucket/aws"
280257 version = " ~> 3.0"
281258
282- create_bucket = local. create_velero_bucket
259+ create_bucket = try ( local. aws_addons . enable_velero , false )
283260
284261 bucket_prefix = " ${ local . name } -"
285262
0 commit comments