diff --git a/modules/kubernetes-addons/helm-addon/main.tf b/modules/kubernetes-addons/helm-addon/main.tf
index 3ec401dc32..252c8f79bc 100644
--- a/modules/kubernetes-addons/helm-addon/main.tf
+++ b/modules/kubernetes-addons/helm-addon/main.tf
@@ -61,12 +61,14 @@ resource "helm_release" "addon" {
}
module "irsa" {
- count = var.irsa_config != null ? 1 : 0
- source = "../../irsa"
+ source = "../../irsa"
+
+ count = length(var.irsa_config) > 0 ? 1 : 0
+
create_kubernetes_namespace = try(var.irsa_config.create_kubernetes_namespace, true)
create_kubernetes_service_account = try(var.irsa_config.create_kubernetes_service_account, true)
- kubernetes_namespace = var.irsa_config.kubernetes_namespace
- kubernetes_service_account = var.irsa_config.kubernetes_service_account
+ kubernetes_namespace = lookup(var.irsa_config, "kubernetes_namespace", "")
+ kubernetes_service_account = lookup(var.irsa_config, "kubernetes_service_account", "")
kubernetes_svc_image_pull_secrets = try(var.irsa_config.kubernetes_svc_image_pull_secrets, null)
irsa_iam_policies = lookup(var.irsa_config, "irsa_iam_policies", null)
irsa_iam_role_name = var.irsa_iam_role_name
diff --git a/modules/kubernetes-addons/helm-addon/variables.tf b/modules/kubernetes-addons/helm-addon/variables.tf
index 0bc0154159..d8d706e8fd 100644
--- a/modules/kubernetes-addons/helm-addon/variables.tf
+++ b/modules/kubernetes-addons/helm-addon/variables.tf
@@ -31,30 +31,9 @@ variable "irsa_config" {
description = "Input configuration for IRSA module"
type = any
default = {}
- # type = object({
- # kubernetes_namespace = string
- # create_kubernetes_namespace = optional(bool)
- # kubernetes_service_account = string
- # create_kubernetes_service_account = optional(bool)
- # kubernetes_svc_image_pull_secrets = optional(list(string))
- # irsa_iam_policies = optional(list(string))
- # })
}
variable "addon_context" {
description = "Input configuration for the addon"
type = any
- # type = object({
- # aws_caller_identity_account_id = string
- # aws_caller_identity_arn = string
- # aws_eks_cluster_endpoint = string
- # aws_partition_id = string
- # aws_region_name = string
- # eks_cluster_id = string
- # eks_oidc_issuer_url = string
- # eks_oidc_provider_arn = string
- # tags = map(string)
- # irsa_iam_role_path = optional(string)
- # irsa_iam_permissions_boundary = optional(string)
- # })
}
diff --git a/modules/launch-templates/README.md b/modules/launch-templates/README.md
index 94540d9ad9..74626e66c6 100644
--- a/modules/launch-templates/README.md
+++ b/modules/launch-templates/README.md
@@ -97,7 +97,7 @@ module "launch_templates" {
| Name | Version |
|------|---------|
-| [terraform](#requirement\_terraform) | >= 1.0.0, < 1.3.0 |
+| [terraform](#requirement\_terraform) | >= 1.0.0 |
| [aws](#requirement\_aws) | >= 3.72 |
## Providers
@@ -122,7 +122,7 @@ No modules.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| [eks\_cluster\_id](#input\_eks\_cluster\_id) | EKS Cluster ID | `string` | n/a | yes |
-| [launch\_template\_config](#input\_launch\_template\_config) | Launch template configuration | map(object({
ami = string
launch_template_os = optional(string)
launch_template_prefix = string
instance_type = optional(string)
capacity_type = optional(string)
iam_instance_profile = optional(string)
vpc_security_group_ids = optional(list(string)) # conflicts with network_interfaces
network_interfaces = optional(list(object({
public_ip = optional(bool)
security_groups = optional(list(string))
})))
block_device_mappings = list(object({
device_name = string
volume_type = string
volume_size = string
delete_on_termination = optional(bool)
encrypted = optional(bool)
kms_key_id = optional(string)
iops = optional(string)
throughput = optional(string)
}))
format_mount_nvme_disk = optional(bool)
pre_userdata = optional(string)
bootstrap_extra_args = optional(string)
post_userdata = optional(string)
kubelet_extra_args = optional(string)
enable_metadata_options = optional(bool)
http_endpoint = optional(string)
http_tokens = optional(string)
http_put_response_hop_limit = optional(number)
http_protocol_ipv6 = optional(string)
instance_metadata_tags = optional(string)
service_ipv6_cidr = optional(string)
service_ipv4_cidr = optional(string)
monitoring = optional(bool)
})) | n/a | yes |
+| [launch\_template\_config](#input\_launch\_template\_config) | Launch template configuration | `any` | n/a | yes |
| [tags](#input\_tags) | Additional tags (e.g. `map('BusinessUnit`,`XYZ`) | `map(string)` | `{}` | no |
## Outputs
diff --git a/modules/launch-templates/data.tf b/modules/launch-templates/data.tf
deleted file mode 100644
index 81be7d557f..0000000000
--- a/modules/launch-templates/data.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-data "aws_eks_cluster" "eks" {
- name = var.eks_cluster_id
-}
diff --git a/modules/launch-templates/locals.tf b/modules/launch-templates/locals.tf
deleted file mode 100644
index 79328b2398..0000000000
--- a/modules/launch-templates/locals.tf
+++ /dev/null
@@ -1,45 +0,0 @@
-terraform {
- # Optional attributes and the defaults function are
- # both experimental, so we must opt in to the experiment.
- experiments = [module_variable_optional_attrs]
-}
-
-locals {
- launch_template_config = defaults(var.launch_template_config, {
- ami = ""
- launch_template_os = "amazonlinux2eks" #bottlerocket
- launch_template_prefix = ""
- instance_type = ""
- capacity_type = ""
- iam_instance_profile = ""
- vpc_security_group_ids = ""
-
- network_interfaces = {
- public_ip = false
- security_groups = ""
- }
-
- block_device_mappings = {
- device_name = "/dev/xvda"
- volume_type = "gp3" # The volume type. Can be standard, gp2, gp3, io1, io2, sc1 or st1 (Default: gp3).
- volume_size = 200
- delete_on_termination = true
- encrypted = true
- kms_key_id = ""
- iops = 3000
- throughput = 125
- }
-
- pre_userdata = ""
- bootstrap_extra_args = ""
- post_userdata = ""
- kubelet_extra_args = ""
-
- service_ipv6_cidr = ""
- service_ipv4_cidr = ""
- format_mount_nvme_disk = false
-
- monitoring = true
- enable_metadata_options = true
- })
-}
diff --git a/modules/launch-templates/main.tf b/modules/launch-templates/main.tf
index c248e815d1..34f202756f 100644
--- a/modules/launch-templates/main.tf
+++ b/modules/launch-templates/main.tf
@@ -1,30 +1,34 @@
+data "aws_eks_cluster" "eks" {
+ name = var.eks_cluster_id
+}
+
resource "aws_launch_template" "this" {
- for_each = local.launch_template_config
+ for_each = var.launch_template_config
- name = format("%s-%s", each.value.launch_template_prefix, var.eks_cluster_id)
+ name = format("%s-%s", try(each.value.launch_template_prefix, ""), var.eks_cluster_id)
description = "Launch Template for Amazon EKS Worker Nodes"
- image_id = each.value.ami
+ image_id = try(each.value.ami, null)
update_default_version = true
- instance_type = try(length(each.value.instance_type), 0) == 0 ? null : each.value.instance_type
+ instance_type = try(each.value.instance_type, null)
- user_data = base64encode(templatefile("${path.module}/templates/userdata-${each.value.launch_template_os}.tpl",
+ user_data = base64encode(templatefile("${path.module}/templates/userdata-${try(each.value.launch_template_os, "amazonlinux2eks")}.tpl",
{
- pre_userdata = each.value.pre_userdata
- post_userdata = each.value.post_userdata
- bootstrap_extra_args = each.value.bootstrap_extra_args
- kubelet_extra_args = each.value.kubelet_extra_args
+ pre_userdata = try(each.value.pre_userdata, "")
+ post_userdata = try(each.value.post_userdata, "")
+ bootstrap_extra_args = try(each.value.bootstrap_extra_args, "")
+ kubelet_extra_args = try(each.value.kubelet_extra_args, "")
eks_cluster_id = var.eks_cluster_id
cluster_ca_base64 = data.aws_eks_cluster.eks.certificate_authority[0].data
cluster_endpoint = data.aws_eks_cluster.eks.endpoint
- service_ipv6_cidr = try(each.value.service_ipv6_cidr, "")
- service_ipv4_cidr = try(each.value.service_ipv4_cidr, "")
- format_mount_nvme_disk = each.value.format_mount_nvme_disk
+ service_ipv6_cidr = try(each.value.service_ipv6_cidr, "") == null ? "" : each.value.service_ipv6_cidr
+ service_ipv4_cidr = try(each.value.service_ipv4_cidr, "") == null ? "" : each.value.service_ipv4_cidr
+ format_mount_nvme_disk = try(each.value.format_mount_nvme_disk, false)
}))
dynamic "iam_instance_profile" {
- for_each = try(length(each.value.iam_instance_profile), 0) == 0 ? {} : { iam_instance_profile : each.value.iam_instance_profile }
+ for_each = length(try(each.value.iam_instance_profile, {})) > 0 ? { iam_instance_profile : each.value.iam_instance_profile } : {}
iterator = iam
content {
name = iam.value
@@ -32,7 +36,7 @@ resource "aws_launch_template" "this" {
}
dynamic "instance_market_options" {
- for_each = trimspace(lower(each.value.capacity_type)) == "spot" ? { enabled = true } : {}
+ for_each = trimspace(lower(try(each.value.capacity_type, null))) == "spot" ? { enabled = true } : {}
content {
market_type = each.value.capacity_type
@@ -42,7 +46,7 @@ resource "aws_launch_template" "this" {
ebs_optimized = true
dynamic "block_device_mappings" {
- for_each = each.value.block_device_mappings
+ for_each = try(each.value.block_device_mappings, {})
content {
device_name = try(block_device_mappings.value.device_name, null)
@@ -53,24 +57,25 @@ resource "aws_launch_template" "this" {
kms_key_id = try(block_device_mappings.value.kms_key_id, null)
volume_size = try(block_device_mappings.value.volume_size, null)
volume_type = try(block_device_mappings.value.volume_type, null)
- iops = block_device_mappings.value.volume_type == "gp3" || block_device_mappings.value.volume_type == "io1" || block_device_mappings.value.volume_type == "io2" ? block_device_mappings.value.iops : null
- throughput = block_device_mappings.value.volume_type == "gp3" ? block_device_mappings.value.throughput : null
+ iops = contains(["gp3", "io1", "io2"], try(block_device_mappings.value.volume_type, "")) ? try(block_device_mappings.value.iops, 3000) : null
+ throughput = try(block_device_mappings.value.volume_type, "") == "gp3" ? try(block_device_mappings.value.throughput, 125) : null
}
}
}
- vpc_security_group_ids = try(length(each.value.vpc_security_group_ids), 0) == 0 ? null : each.value.vpc_security_group_ids
+ vpc_security_group_ids = try(each.value.vpc_security_group_ids, null)
dynamic "network_interfaces" {
- for_each = each.value.network_interfaces
+ for_each = try(each.value.network_interfaces, {})
+
content {
associate_public_ip_address = try(network_interfaces.value.public_ip, false)
- security_groups = try(length(network_interfaces.value.security_groups), 0) == 0 ? null : network_interfaces.value.security_groups
+ security_groups = try(network_interfaces.value.security_groups, null)
}
}
dynamic "monitoring" {
- for_each = each.value.monitoring ? [1] : []
+ for_each = try(each.value.monitoring, true) ? [1] : []
content {
enabled = true
@@ -78,7 +83,7 @@ resource "aws_launch_template" "this" {
}
dynamic "metadata_options" {
- for_each = each.value.enable_metadata_options ? [1] : []
+ for_each = try(each.value.enable_metadata_options, true) ? [1] : []
content {
http_endpoint = try(each.value.http_endpoint, "enabled")
diff --git a/modules/launch-templates/variables.tf b/modules/launch-templates/variables.tf
index 46f90560d6..2702804f54 100644
--- a/modules/launch-templates/variables.tf
+++ b/modules/launch-templates/variables.tf
@@ -1,48 +1,6 @@
variable "launch_template_config" {
description = "Launch template configuration"
- type = map(object({
- ami = string
- launch_template_os = optional(string)
- launch_template_prefix = string
- instance_type = optional(string)
- capacity_type = optional(string)
- iam_instance_profile = optional(string)
- vpc_security_group_ids = optional(list(string)) # conflicts with network_interfaces
-
- network_interfaces = optional(list(object({
- public_ip = optional(bool)
- security_groups = optional(list(string))
- })))
-
- block_device_mappings = list(object({
- device_name = string
- volume_type = string
- volume_size = string
- delete_on_termination = optional(bool)
- encrypted = optional(bool)
- kms_key_id = optional(string)
- iops = optional(string)
- throughput = optional(string)
- }))
-
- format_mount_nvme_disk = optional(bool)
- pre_userdata = optional(string)
- bootstrap_extra_args = optional(string)
- post_userdata = optional(string)
- kubelet_extra_args = optional(string)
-
- enable_metadata_options = optional(bool)
- http_endpoint = optional(string)
- http_tokens = optional(string)
- http_put_response_hop_limit = optional(number)
- http_protocol_ipv6 = optional(string)
- instance_metadata_tags = optional(string)
-
- service_ipv6_cidr = optional(string)
- service_ipv4_cidr = optional(string)
-
- monitoring = optional(bool)
- }))
+ type = any
}
variable "eks_cluster_id" {
diff --git a/modules/launch-templates/versions.tf b/modules/launch-templates/versions.tf
index 6b8f195336..f92f41b9e7 100644
--- a/modules/launch-templates/versions.tf
+++ b/modules/launch-templates/versions.tf
@@ -1,5 +1,5 @@
terraform {
- required_version = ">= 1.0.0, < 1.3.0"
+ required_version = ">= 1.0.0"
required_providers {
aws = {