Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.6.9 #23

Merged
merged 6 commits into from
Mar 11, 2024
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
2 changes: 1 addition & 1 deletion cert-manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ locals {
module "cert_manager_irsa" {
count = var.cert_manager ? 1 : 0
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "~> 5.34.0"
version = "~> 5.37.1"

role_name = "${var.cluster_name}-cert-manager-role"

Expand Down
2 changes: 1 addition & 1 deletion crossplane.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module "crossplane_irsa" {
count = var.crossplane && var.crossplane_irsa ? 1 : 0
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "~> 5.34.0"
version = "~> 5.37.1"

role_name = "${var.cluster_name}-crossplane-role"

Expand Down
2 changes: 1 addition & 1 deletion ebs-csi.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module "eks_ebs_csi_driver_irsa" {
count = var.ebs_csi_driver ? 1 : 0
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "~> 5.34.0"
version = "~> 5.37.1"

role_name = "${var.cluster_name}-ebs-csi-role"
attach_ebs_csi_policy = true
Expand Down
2 changes: 1 addition & 1 deletion efs-csi.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ resource "aws_efs_mount_target" "eks_efs_private" {
module "eks_efs_csi_driver_irsa" {
count = var.efs_csi_driver ? 1 : 0
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "~> 5.34.0"
version = "~> 5.37.1"

role_name = "${var.cluster_name}-efs-csi-driver-role"

Expand Down
2 changes: 1 addition & 1 deletion lb-controller.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module "eks_lb_irsa" {
count = var.lb_controller ? 1 : 0
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "~> 5.34.0"
version = "~> 5.37.1"

role_name = "${var.cluster_name}-lb-role"
attach_load_balancer_controller_policy = true
Expand Down
14 changes: 11 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,21 @@ module "eks" { # tfsec:ignore:aws-ec2-no-public-egress-sgr tfsec:ignore:aws-eks-
create_cluster_security_group = var.karpenter ? false : var.create_cluster_security_group
create_node_security_group = var.karpenter ? false : var.create_node_security_group

# KMS key settings
cluster_encryption_config = var.kms_manage ? {
provider_key_arn = aws_kms_key.this[0].arn
resources = ["secrets"]
} : { resources = ["secrets"] }
create_kms_key = var.kms_manage ? false : true
kms_key_deletion_window_in_days = var.kms_key_deletion_window_in_days
kms_key_enable_default_policy = var.kms_key_enable_default_policy
create_kms_key = var.kms_manage ? false : true
enable_kms_key_rotation = var.kms_key_enable_rotation
kms_key_administrators = var.kms_key_administrators
kms_key_deletion_window_in_days = var.kms_key_deletion_window_in_days
kms_key_enable_default_policy = var.kms_key_enable_default_policy
kms_key_owners = var.kms_key_owners
kms_key_service_users = var.kms_key_service_users
kms_key_users = var.kms_key_users
kms_key_source_policy_documents = var.kms_key_source_policy_documents
kms_key_override_policy_documents = var.kms_key_override_policy_documents

cluster_endpoint_private_access = var.cluster_endpoint_private_access
cluster_endpoint_public_access = var.cluster_endpoint_public_access
Expand Down
2 changes: 1 addition & 1 deletion s3-csi.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module "eks_s3_csi_driver_irsa" {
count = var.s3_csi_driver ? 1 : 0

source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "~> 5.34.0"
version = "~> 5.37.1"

role_name = "${var.cluster_name}-s3-csi-driver-role"

Expand Down
56 changes: 52 additions & 4 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ variable "cert_manager_values" {
}

variable "cert_manager_version" {
default = "1.14.3"
default = "1.14.4"
description = "Version of cert-manager to install."
type = string
}
Expand Down Expand Up @@ -263,7 +263,7 @@ variable "efs_csi_driver_values" {
}

variable "efs_csi_driver_version" {
default = "2.5.5"
default = "2.5.6"
description = "Version of the EFS CSI storage driver to install."
type = string
}
Expand Down Expand Up @@ -360,7 +360,7 @@ variable "karpenter_values" {
variable "karpenter_version" {
description = "Version of Karpenter Helm chart to install on the EKS cluster."
type = string
default = "0.34.1"
default = "0.35.1"
}

variable "karpenter_wait" {
Expand All @@ -375,6 +375,18 @@ variable "kms_manage" {
type = bool
}

variable "kms_key_administrators" {
description = "A list of IAM ARNs for [key administrators](https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-default.html#key-policy-default-allow-administrators). If no value is provided, the current caller identity is used to ensure at least one key admin is available"
type = list(string)
default = []
}

variable "kms_key_aliases" {
description = "A list of aliases to create. Note - due to the use of `toset()`, values must be static strings and not computed values"
type = list(string)
default = []
}

variable "kms_key_deletion_window_in_days" {
description = "The waiting period, specified in number of days. After the waiting period ends, AWS KMS deletes the KMS key. If you specify a value, it must be between `7` and `30`, inclusive."
type = number
Expand All @@ -387,6 +399,42 @@ variable "kms_key_enable_default_policy" {
default = true
}

variable "kms_key_enable_rotation" {
description = "Specifies whether key rotation is enabled"
type = bool
default = true
}

variable "kms_key_owners" {
description = "A list of IAM ARNs for those who will have full key permissions (`kms:*`)"
type = list(string)
default = []
}

variable "kms_key_override_policy_documents" {
description = "List of IAM policy documents that are merged together into the exported document. In merging, statements with non-blank `sid`s will override statements with the same `sid`"
type = list(string)
default = []
}

variable "kms_key_service_users" {
description = "A list of IAM ARNs for [key service users](https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-default.html#key-policy-service-integration)"
type = list(string)
default = []
}

variable "kms_key_source_policy_documents" {
description = "List of IAM policy documents that are merged together into the exported document. Statements must have unique `sid`s"
type = list(string)
default = []
}

variable "kms_key_users" {
description = "A list of IAM ARNs for [key users](https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-default.html#key-policy-default-allow-users)"
type = list(string)
default = []
}

variable "kube_proxy" {
description = "Indicates whether to install the kube-proxy cluster addon."
type = bool
Expand Down Expand Up @@ -483,7 +531,7 @@ variable "nvidia_gpu_operator_values" {
}

variable "nvidia_gpu_operator_version" {
default = "23.9.1"
default = "23.9.2"
description = "Version of the NVIDIA GPU Operator Helm chart to install."
type = string
}
Expand Down
2 changes: 1 addition & 1 deletion vpc-cni.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module "eks_vpc_cni_irsa" {
count = var.vpc_cni ? 1 : 0
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "~> 5.34.0"
version = "~> 5.37.1"

role_name = "${var.cluster_name}-vpc-cni-role"

Expand Down
Loading