Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ module "eks" {
eks_version = var.eks_version
aws_region = var.aws_region
ebs_csi_addon_version = var.ebs_csi_addon_version
kube_proxy_addon_version = var.kube_proxy_addon_version
admin_role_arns = data.aws_iam_roles.admin_arn.arns
subnet_ids = [
module.vpc.private_subnets[0].id,
Expand Down
8 changes: 7 additions & 1 deletion terraform/modules/eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ resource "aws_eks_addon" "aws_ebs_csi_driver" {
service_account_role_arn = aws_iam_role.ebs_csi_iam_role.arn
}

resource "aws_eks_addon" "kube_proxy" {
cluster_name = aws_eks_cluster.eks_cluster.name
addon_name = "kube-proxy"
addon_version = var.kube_proxy_addon_version
}

resource "aws_security_group" "eks_cluster_security_group" {
name = "${replace(var.project, " ", "-")}eks-cluster-security-group"
description = "Cluster communication with worker nodes"
Expand Down Expand Up @@ -279,4 +285,4 @@ resource "aws_eks_access_policy_association" "admin_policy" {
depends_on = [
aws_eks_access_entry.admin_role
]
}
}
7 changes: 6 additions & 1 deletion terraform/modules/eks/variable.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ variable "ebs_csi_addon_version" {
description = "Version of AWS EBS CRI driver to use"
}

variable "kube_proxy_addon_version" {
type = string
description = "Version of kube-proxy to use"
}

variable "backups_bucket" {
type = string
description = "S3 bucket to which backups will be performed"
Expand All @@ -38,4 +43,4 @@ variable "backups_bucket" {
variable "admin_role_arns" {
type = set(string)
description = "ARN of the Role used for admin cluster access."
}
}
5 changes: 5 additions & 0 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@ variable "ebs_csi_addon_version" {
description = "Version of AWS EBS CRI driver to use"
}

variable "kube_proxy_addon_version" {
type = string
description = "Version of kube-proxy to use"
}

variable "hibernate" {
description = "If set to true, the EKS cluster will be scaled down and its services unavailable"
type = bool
Expand Down
1 change: 1 addition & 0 deletions terraform/vars/terraform-dev.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ db_logs_exports = ["audit", "profiler"]
eks_version = "1.30"
# eks_node_release_version = "1.29.0-20240202"
ebs_csi_addon_version = "v1.30.0-eksbuild.1"
kube_proxy_addon_version = "v1.30.14-eksbuild.18"
# apps_node_group_min_size = 1
# apps_node_group_max_size = 16
# apps_node_group_desired_size = 3
Expand Down