Skip to content

Commit a1b86dc

Browse files
authored
feat(bootstrap): upgrade AWS EKS to K8s 1.24 + NAT improvements (#811)
* feat(aws): update k8s to 1.24 + nat in each az Signed-off-by: David van der Spek <[email protected]> * ensure s3 endpoint is in each az Signed-off-by: David van der Spek <[email protected]> * bump version Signed-off-by: David van der Spek <[email protected]> --------- Signed-off-by: David van der Spek <[email protected]>
1 parent f84ad5a commit a1b86dc

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

bootstrap/terraform/aws-bootstrap/deps.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: plural.sh/v1alpha1
22
kind: Dependencies
33
metadata:
4-
description: Creates an EKS cluster and prepares it for bootstrapping
5-
version: 0.1.51
4+
description: Creates an EKS cluster and prepares it for bootstrapping
5+
version: 0.1.52
66
spec:
77
breaking: true
88
dependencies: []

bootstrap/terraform/aws-bootstrap/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module "vpc" {
1717
database_subnets = var.database_subnets
1818

1919
enable_nat_gateway = true
20-
single_nat_gateway = true
20+
single_nat_gateway = false
2121

2222
public_subnet_tags = {
2323
"kubernetes.io/cluster/${var.cluster_name}" = "shared"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
data "aws_route_table" "worker_private_subnets_route_table" {
2-
count = var.enable_vpc_s3_endpoint && length(local.worker_private_subnet_ids) > 0 ? 1 : 0
3-
subnet_id = local.worker_private_subnet_ids[0]
2+
count = var.enable_vpc_s3_endpoint && length(local.worker_private_subnet_ids) > 0 ? length(local.worker_private_subnet_ids) : 0
3+
subnet_id = local.worker_private_subnet_ids[count.index]
44
}
55

66
resource "aws_vpc_endpoint" "s3" {
77
count = var.enable_vpc_s3_endpoint && length(local.worker_private_subnet_ids) > 0 ? 1 : 0
88
vpc_id = local.vpc_id
99
service_name = "com.amazonaws.${var.aws_region}.s3"
1010
auto_accept = true
11-
route_table_ids = [data.aws_route_table.worker_private_subnets_route_table[0].id]
12-
}
11+
route_table_ids = data.aws_route_table.worker_private_subnets_route_table[*].id
12+
}

bootstrap/terraform/aws-bootstrap/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variable "cluster_log_retention_in_days" {
2828
variable "kubernetes_version" {
2929
type = string
3030
description = "Kubernetes version to use for the cluster"
31-
default = "1.23"
31+
default = "1.24"
3232
}
3333

3434
variable "vpc_cni_addon_version" {
@@ -225,7 +225,7 @@ variable "node_groups_defaults" {
225225

226226
instance_types = ["t3.large", "t3a.large"]
227227
disk_size = 50
228-
ami_release_version = "1.23.16-20230217"
228+
ami_release_version = "1.24.15-20230816"
229229
force_update_version = true
230230
ami_type = "AL2_x86_64"
231231
k8s_labels = {}

0 commit comments

Comments
 (0)