diff --git a/aws/platform/main.tf b/aws/platform/main.tf index ea4ccce0..74b8c619 100644 --- a/aws/platform/main.tf +++ b/aws/platform/main.tf @@ -77,6 +77,7 @@ module "aws_load_balancer_controller" { k8s_namespace = var.k8s_namespace oidc_issuer = data.aws_ssm_parameter.oidc_issuer.value vpc_cidr_block = module.network.vpc.cidr_block + vpc_id = module.network.vpc.id depends_on = [module.common_platform] } diff --git a/aws/platform/modules/load-balancer-controller/README.md b/aws/platform/modules/load-balancer-controller/README.md index 2c632620..da9fe3a4 100644 --- a/aws/platform/modules/load-balancer-controller/README.md +++ b/aws/platform/modules/load-balancer-controller/README.md @@ -36,6 +36,7 @@ target group bound to the Istio ingress gateway service. | [helm_release.ingress_config](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | | [helm_release.this](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | | [aws_lb_target_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/lb_target_group) | data source | +| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source | ## Inputs @@ -53,4 +54,5 @@ target group bound to the Istio ingress gateway service. | [oidc\_issuer](#input\_oidc\_issuer) | OIDC issuer of the Kubernetes cluster | `string` | n/a | yes | | [target\_group\_name](#input\_target\_group\_name) | Override the name of the target group for this cluster | `string` | `null` | no | | [vpc\_cidr\_block](#input\_vpc\_cidr\_block) | CIDR block for the AWS VPC in which the load balancer runs | `string` | n/a | yes | +| [vpc\_id](#input\_vpc\_id) | The VPC ID for the Kubernetes cluster. | `string` | n/a | yes | \ No newline at end of file diff --git a/aws/platform/modules/load-balancer-controller/main.tf b/aws/platform/modules/load-balancer-controller/main.tf index 77b69937..a337b4d5 100644 --- a/aws/platform/modules/load-balancer-controller/main.tf +++ b/aws/platform/modules/load-balancer-controller/main.tf @@ -76,6 +76,8 @@ resource "aws_iam_role_policy_attachment" "this" { policy_arn = aws_iam_policy.this.arn } +data "aws_region" "current" {} + locals { chart_defaults = jsondecode(file("${path.module}/chart.json")) @@ -90,6 +92,8 @@ locals { "eks.amazonaws.com/role-arn" = module.service_account_role.arn } } + region = data.aws_region.current.name + vpcId = var.vpc_id }) ] } diff --git a/aws/platform/modules/load-balancer-controller/variables.tf b/aws/platform/modules/load-balancer-controller/variables.tf index 2a6e9402..ecb824f2 100644 --- a/aws/platform/modules/load-balancer-controller/variables.tf +++ b/aws/platform/modules/load-balancer-controller/variables.tf @@ -66,3 +66,8 @@ variable "vpc_cidr_block" { type = string description = "CIDR block for the AWS VPC in which the load balancer runs" } + +variable "vpc_id" { + type = string + description = "The VPC ID for the Kubernetes cluster." +} diff --git a/charts.json b/charts.json index 77fbb8d6..a5baca25 100644 --- a/charts.json +++ b/charts.json @@ -7,7 +7,7 @@ "cert-manager": { "chart": "cert-manager", "repository": "https://charts.jetstack.io", - "version": "v1.10.1" + "version": "v1.12.13" }, "cluster-autoscaler": { "chart": "cluster-autoscaler", @@ -27,17 +27,17 @@ "istio-base": { "chart": "base", "repository": "https://istio-release.storage.googleapis.com/charts", - "version": "1.16.1" + "version": "1.23.0" }, "istiod": { "chart": "istiod", "repository": "https://istio-release.storage.googleapis.com/charts", - "version": "1.16.1" + "version": "1.23.0" }, "istio-ingress": { "chart": "gateway", "repository": "https://istio-release.storage.googleapis.com/charts", - "version": "1.16.1" + "version": "1.23.0" }, "load-balancer-controller": { "chart": "aws-load-balancer-controller", diff --git a/platform/modules/cert-manager/chart.json b/platform/modules/cert-manager/chart.json index add823fe..cc0e1dd9 100644 --- a/platform/modules/cert-manager/chart.json +++ b/platform/modules/cert-manager/chart.json @@ -1,5 +1,5 @@ { "chart": "cert-manager", "repository": "https://charts.jetstack.io", - "version": "v1.10.1" + "version": "v1.12.13" } diff --git a/platform/modules/istio-base/chart.json b/platform/modules/istio-base/chart.json index 991d6904..76f20208 100644 --- a/platform/modules/istio-base/chart.json +++ b/platform/modules/istio-base/chart.json @@ -1,5 +1,5 @@ { "chart": "base", "repository": "https://istio-release.storage.googleapis.com/charts", - "version": "1.16.1" + "version": "1.23.0" } diff --git a/platform/modules/istio-ingress/chart.json b/platform/modules/istio-ingress/chart.json index 89e6b809..1aaa6856 100644 --- a/platform/modules/istio-ingress/chart.json +++ b/platform/modules/istio-ingress/chart.json @@ -1,5 +1,5 @@ { "chart": "gateway", "repository": "https://istio-release.storage.googleapis.com/charts", - "version": "1.16.1" + "version": "1.23.0" } diff --git a/platform/modules/istiod/chart.json b/platform/modules/istiod/chart.json index 863c150c..160ce918 100644 --- a/platform/modules/istiod/chart.json +++ b/platform/modules/istiod/chart.json @@ -1,5 +1,5 @@ { "chart": "istiod", "repository": "https://istio-release.storage.googleapis.com/charts", - "version": "1.16.1" + "version": "1.23.0" }