feat: upgrade helm charts compatibility to kubernetes 1.36

aws/ingress/README.md

@@ -95,13 +95,13 @@ module "ingress" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.8 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_alb"></a> [alb](#module\_alb) | github.com/thoughtbot/terraform-alb-ingress | v0.5.2 |
+| <a name="module_alb"></a> [alb](#module\_alb) | github.com/thoughtbot/terraform-alb-ingress | v0.8.0 |
 | <a name="module_cluster_name"></a> [cluster\_name](#module\_cluster\_name) | ../cluster-name | n/a |
 | <a name="module_network"></a> [network](#module\_network) | ../network-data | n/a |
 | <a name="module_waf"></a> [waf](#module\_waf) | ../waf | n/a |

aws/ingress/main.tf

@@ -1,28 +1,25 @@
 module "alb" {
-  # TODO: update ref when merged into main
-  providers = { aws.cluster = aws.cluster, aws.route53 = aws.route53 }
-  source    = "github.com/thoughtbot/terraform-alb-ingress?ref=v0.5.2"
+  providers = { aws.alb = aws.cluster, aws.route53 = aws.route53 }
+  source    = "github.com/thoughtbot/terraform-alb-ingress?ref=v0.8.0"
 
-  alarm_actions             = var.alarm_actions
-  alarm_evaluation_minutes  = var.alarm_evaluation_minutes
-  alternative_domain_names  = var.alternative_domain_names
-  certificate_domain_name   = var.certificate_domain_name
-  create_aliases            = var.create_aliases
-  description               = "Flightdeck cluster load balancer"
-  failure_threshold         = var.failure_threshold
-  hosted_zone_name          = var.hosted_zone_name
-  issue_certificates        = var.issue_certificates
-  legacy_target_group_names = var.legacy_target_group_names
-  name                      = var.name
-  namespace                 = var.namespace
-  primary_domain_name       = var.primary_domain_name
-  slow_response_threshold   = var.slow_response_threshold
-  subnet_ids                = module.network.public_subnet_ids
-  tags                      = var.tags
-  target_groups             = local.target_groups
-  target_group_weights      = var.target_group_weights
-  validate_certificates     = var.validate_certificates
-  vpc_id                    = module.network.vpc.id
+  alarm_actions              = var.alarm_actions
+  alarm_evaluation_minutes   = var.alarm_evaluation_minutes
+  create_domain_aliases      = var.create_aliases ? local.domain_names : []
+  description                = "Flightdeck cluster load balancer"
+  failure_threshold          = var.failure_threshold
+  hosted_zone_name           = var.hosted_zone_name
+  issue_certificate_domains  = var.issue_certificates ? local.domain_names : []
+  legacy_target_group_names  = var.legacy_target_group_names
+  name                       = join("-", concat(var.namespace, [var.name]))
+  primary_certificate_domain = coalesce(var.certificate_domain_name, var.primary_domain_name)
+  security_group_name        = join("-", concat(var.namespace, [var.name]))
+  slow_response_threshold    = var.slow_response_threshold
+  subnet_ids                 = module.network.public_subnet_ids
+  tags                       = var.tags
+  target_groups              = local.target_groups
+  target_group_weights       = var.target_group_weights
+  validate_certificates      = var.validate_certificates
+  vpc_id                     = module.network.vpc.id
 
   depends_on = [module.network]
 }
@@ -45,6 +42,11 @@ locals {
     values(module.cluster_name).*.shared_tags...
   )
 
+  # terraform-alb-ingress v0.8.0 replaced the old create_aliases/issue_certificates
+  # booleans with explicit domain lists; this reconstructs the same "primary +
+  # alternatives" bundling the old boolean-driven behavior used.
+  domain_names = concat([var.primary_domain_name], var.alternative_domain_names)
+
   target_groups = zipmap(
     var.cluster_names,
     [

aws/ingress/versions.tf

@@ -4,7 +4,7 @@ terraform {
     aws = {
       configuration_aliases = [aws.cluster, aws.route53]
       source                = "hashicorp/aws"
-      version               = "~> 5.0"
+      version               = "~> 6.0"
     }
   }
 }

aws/network/README.md

@@ -71,7 +71,7 @@ module "network" {
 | <a name="module_private_subnets"></a> [private\_subnets](#module\_private\_subnets) | ./modules/private-subnets | n/a |
 | <a name="module_public_subnet_routes"></a> [public\_subnet\_routes](#module\_public\_subnet\_routes) | ./modules/public-subnet-routes | n/a |
 | <a name="module_public_subnets"></a> [public\_subnets](#module\_public\_subnets) | ./modules/public-subnets | n/a |
-| <a name="module_s3_endpoint"></a> [s3\_endpoint](#module\_s3\_endpoint) | ./modules/vpc-endpoints/s3-vpc-endpoint | n/a |
+| <a name="module_s3_endpoint"></a> [s3\_endpoint](#module\_s3\_endpoint) | ./modules/vpc-endpoints | n/a |
 | <a name="module_vpc"></a> [vpc](#module\_vpc) | ./modules/vpc | n/a |
 
 ## Resources

aws/network/main.tf

@@ -89,7 +89,7 @@ module "public_subnet_routes" {
 
 module "s3_endpoint" {
   count  = var.create_s3_endpoint ? 1 : 0
-  source = "./modules/vpc-endpoints/s3-vpc-endpoint"
+  source = "./modules/vpc-endpoints"
 
   name      = var.name
   namespace = var.namespace

aws/network/modules/vpc-endpoints/README.md

@@ -0,0 +1,41 @@
+# AWS S3 VPC Endpoint
+
+Module for creating a S3 VPC Endpoint in AWS.
+<!-- BEGIN_TF_DOCS -->
+## Requirements
+
+| Name | Version |
+|------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.6.2 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |
+
+## Providers
+
+| Name | Version |
+|------|---------|
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 6.0 |
+
+## Resources
+
+| Name | Type |
+|------|------|
+| [aws_vpc_endpoint.s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc_endpoint) | resource |
+| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
+
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| <a name="input_name"></a> [name](#input\_name) | Name for this network (used in the endpoint's Name tag) | `string` | n/a | yes |
+| <a name="input_namespace"></a> [namespace](#input\_namespace) | Prefix to be applied to created resources | `list(string)` | `[]` | no |
+| <a name="input_route_table_ids"></a> [route\_table\_ids](#input\_route\_table\_ids) | List of route table IDs to associate with the S3 Gateway endpoint | `list(string)` | n/a | yes |
+| <a name="input_tags"></a> [tags](#input\_tags) | Tags to be applied to the endpoint | `map(string)` | `{}` | no |
+| <a name="input_vpc"></a> [vpc](#input\_vpc) | The VPC object in which to create the S3 endpoint | <pre>object({<br>    id = string<br>  })</pre> | n/a | yes |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| <a name="output_endpoint_id"></a> [endpoint\_id](#output\_endpoint\_id) | ID of the S3 Gateway VPC endpoint |
+| <a name="output_prefix_list_id"></a> [prefix\_list\_id](#output\_prefix\_list\_id) | Prefix list ID of the S3 endpoint (useful for security group egress rules) |
+<!-- END_TF_DOCS -->

aws/waf/README.md

@@ -55,13 +55,13 @@ Note: For each rule, if you are providing a country list, you can only specify e
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.4.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 6.0 |
 
 ## Modules
 

aws/waf/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }

charts.json

@@ -7,7 +7,7 @@
   "cert-manager": {
     "chart": "cert-manager",
     "repository": "https://charts.jetstack.io",
-    "version": "v1.19.1"
+    "version": "v1.21.2"
   },
   "cluster-autoscaler": {
     "chart": "cluster-autoscaler",
@@ -27,17 +27,17 @@
   "istio-base": {
     "chart": "base",
     "repository": "https://istio-release.storage.googleapis.com/charts",
-    "version": "1.28.0"
+    "version": "1.30.4"
   },
   "istiod": {
     "chart": "istiod",
     "repository": "https://istio-release.storage.googleapis.com/charts",
-    "version": "1.28.0"
+    "version": "1.30.4"
   },
   "istio-ingress": {
     "chart": "gateway",
     "repository": "https://istio-release.storage.googleapis.com/charts",
-    "version": "1.28.0"
+    "version": "1.30.4"
   },
   "load-balancer-controller": {
     "chart": "aws-load-balancer-controller",

makefile

@@ -6,16 +6,11 @@ export TFDOCSRC := $(CURDIR)/.terraform-docs.yml
 
 SUBMODULES         := $(filter-out \
 	%.md,\
-	$(foreach dir,\
-		$(wildcard \
-			platform/modules/* \
-			platform \
-			aws/*/modules/* \
-			aws/* \
-			platform/modules/*/* \
-			aws/*/modules/*/* \
-			),\
-		$(if $(wildcard $(dir)/*.tf),$(dir),)\
+	$(wildcard \
+		platform/modules/* \
+		platform \
+		aws/*/modules/*\
+		aws/* \
 		)\
 	)
 SUBMODULEMAKEFILES := $(foreach module,$(SUBMODULES),$(module)/makefile)

platform/modules/cert-manager/chart.json

@@ -1,5 +1,5 @@
 {
   "chart": "cert-manager",
   "repository": "https://charts.jetstack.io",
-  "version": "v1.19.1"
+  "version": "v1.21.2"
 }

platform/modules/istio-base/chart.json

@@ -1,5 +1,5 @@
 {
   "chart": "base",
   "repository": "https://istio-release.storage.googleapis.com/charts",
-  "version": "1.28.0"
+  "version": "1.30.4"
 }

platform/modules/istio-ingress/chart.json

@@ -1,5 +1,5 @@
 {
   "chart": "gateway",
   "repository": "https://istio-release.storage.googleapis.com/charts",
-  "version": "1.28.0"
+  "version": "1.30.4"
 }

platform/modules/istiod/chart.json

@@ -1,5 +1,5 @@
 {
   "chart": "istiod",
   "repository": "https://istio-release.storage.googleapis.com/charts",
-  "version": "1.28.0"
+  "version": "1.30.4"
 }