xpk/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/terraform-aws-modules/terraform-aws-eks.git synced 2025-09-09 19:32:58 +08:00
Code Activity

fix: Correct variable defaults for ami_id and kubernetes_version (#3437)

Browse Source
This commit is contained in:
Bryant Biggs
2025-07-24 15:28:35 -05:00
committed by GitHub
parent 7efa43f11c
commit 8807e0bb55
5 changed files with 73 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
File diff suppressed because one or more lines are too long
modules/eks-managed-node-group/variables.tf
+1
View File
@@ -163,6 +163,7 @@ variable "ami_id" {
description = "The AMI from which to launch the instance. If not supplied, EKS will use its own default image" description = "The AMI from which to launch the instance. If not supplied, EKS will use its own default image"
type = string type = string
default = "" default = ""
nullable = false
} }
variable "key_name" { variable "key_name" {
modules/self-managed-node-group/variables.tf
+1
View File
@@ -359,6 +359,7 @@ variable "ami_id" {
description = "The AMI from which to launch the instance" description = "The AMI from which to launch the instance"
type = string type = string
default = "" default = ""
nullable = false
} }
variable "ami_type" { variable "ami_type" {
node_groups.tf
+66 -65
View File
@@ -274,7 +274,8 @@ module "eks_managed_node_group" {
account_id = local.account_id account_id = local.account_id
cluster_name = time_sleep.this[0].triggers["name"] cluster_name = time_sleep.this[0].triggers["name"]
kubernetes_version = try(each.value.kubernetes_version, time_sleep.this[0].triggers["kubernetes_version"]) kubernetes_version = each.value.kubernetes_version != null ? each.value.kubernetes_version : time_sleep.this[0].triggers["kubernetes_version"]
# EKS Managed Node Group # EKS Managed Node Group
name = coalesce(each.value.name, each.key) name = coalesce(each.value.name, each.key)
@@ -445,88 +446,88 @@ module "self_managed_node_group" {
autoscaling_group_tags = each.value.autoscaling_group_tags autoscaling_group_tags = each.value.autoscaling_group_tags
# User data # User data
ami_type = try(each.value.ami_type, null) ami_type = each.value.ami_type
cluster_endpoint = try(time_sleep.this[0].triggers["endpoint"], "") cluster_endpoint = try(time_sleep.this[0].triggers["endpoint"], "")
cluster_auth_base64 = try(time_sleep.this[0].triggers["certificate_authority_data"], "") cluster_auth_base64 = try(time_sleep.this[0].triggers["certificate_authority_data"], "")
cluster_service_cidr = try(time_sleep.this[0].triggers["service_cidr"], "") cluster_service_cidr = try(time_sleep.this[0].triggers["service_cidr"], "")
additional_cluster_dns_ips = try(each.value.additional_cluster_dns_ips, null) additional_cluster_dns_ips = each.value.additional_cluster_dns_ips
cluster_ip_family = var.ip_family cluster_ip_family = var.ip_family
pre_bootstrap_user_data = try(each.value.pre_bootstrap_user_data, null) pre_bootstrap_user_data = each.value.pre_bootstrap_user_data
post_bootstrap_user_data = try(each.value.post_bootstrap_user_data, null) post_bootstrap_user_data = each.value.post_bootstrap_user_data
bootstrap_extra_args = try(each.value.bootstrap_extra_args, null) bootstrap_extra_args = each.value.bootstrap_extra_args
user_data_template_path = try(each.value.user_data_template_path, null) user_data_template_path = each.value.user_data_template_path
cloudinit_pre_nodeadm = try(each.value.cloudinit_pre_nodeadm, null) cloudinit_pre_nodeadm = each.value.cloudinit_pre_nodeadm
cloudinit_post_nodeadm = try(each.value.cloudinit_post_nodeadm, null) cloudinit_post_nodeadm = each.value.cloudinit_post_nodeadm
# Launch Template # Launch Template
create_launch_template = try(each.value.create_launch_template, null) create_launch_template = each.value.create_launch_template
launch_template_id = try(each.value.launch_template_id, null) launch_template_id = each.value.launch_template_id
launch_template_name = coalesce(each.value.launch_template_name, each.key) launch_template_name = coalesce(each.value.launch_template_name, each.key)
launch_template_use_name_prefix = try(each.value.launch_template_use_name_prefix, null) launch_template_use_name_prefix = each.value.launch_template_use_name_prefix
launch_template_version = try(each.value.launch_template_version, null) launch_template_version = each.value.launch_template_version
launch_template_default_version = try(each.value.launch_template_default_version, null) launch_template_default_version = each.value.launch_template_default_version
update_launch_template_default_version = try(each.value.update_launch_template_default_version, null) update_launch_template_default_version = each.value.update_launch_template_default_version
launch_template_description = coalesce(each.value.launch_template_description, "Custom launch template for ${coalesce(each.value.name, each.key)} self managed node group") launch_template_description = coalesce(each.value.launch_template_description, "Custom launch template for ${coalesce(each.value.name, each.key)} self managed node group")
launch_template_tags = try(each.value.launch_template_tags, null) launch_template_tags = each.value.launch_template_tags
tag_specifications = try(each.value.tag_specifications, null) tag_specifications = each.value.tag_specifications
ebs_optimized = try(each.value.ebs_optimized, null) ebs_optimized = each.value.ebs_optimized
ami_id = try(each.value.ami_id, null) ami_id = each.value.ami_id
kubernetes_version = try(each.value.kubernetes_version, time_sleep.this[0].triggers["kubernetes_version"]) kubernetes_version = each.value.kubernetes_version != null ? each.value.kubernetes_version : time_sleep.this[0].triggers["kubernetes_version"]
instance_type = try(each.value.instance_type, null) instance_type = each.value.instance_type
key_name = try(each.value.key_name, null) key_name = each.value.key_name
disable_api_termination = try(each.value.disable_api_termination, null) disable_api_termination = each.value.disable_api_termination
instance_initiated_shutdown_behavior = try(each.value.instance_initiated_shutdown_behavior, null) instance_initiated_shutdown_behavior = each.value.instance_initiated_shutdown_behavior
kernel_id = try(each.value.kernel_id, null) kernel_id = each.value.kernel_id
ram_disk_id = try(each.value.ram_disk_id, null) ram_disk_id = each.value.ram_disk_id
block_device_mappings = try(each.value.block_device_mappings, null) block_device_mappings = each.value.block_device_mappings
capacity_reservation_specification = try(each.value.capacity_reservation_specification, null) capacity_reservation_specification = each.value.capacity_reservation_specification
cpu_options = try(each.value.cpu_options, null) cpu_options = each.value.cpu_options
credit_specification = try(each.value.credit_specification, null) credit_specification = each.value.credit_specification
enclave_options = try(each.value.enclave_options, null) enclave_options = each.value.enclave_options
instance_requirements = try(each.value.instance_requirements, null) instance_requirements = each.value.instance_requirements
instance_market_options = try(each.value.instance_market_options, null) instance_market_options = each.value.instance_market_options
license_specifications = try(each.value.license_specifications, null) license_specifications = each.value.license_specifications
metadata_options = try(each.value.metadata_options, null) metadata_options = each.value.metadata_options
enable_monitoring = try(each.value.enable_monitoring, null) enable_monitoring = each.value.enable_monitoring
enable_efa_support = try(each.value.enable_efa_support, null) enable_efa_support = each.value.enable_efa_support
enable_efa_only = try(each.value.enable_efa_only, null) enable_efa_only = each.value.enable_efa_only
efa_indices = try(each.value.efa_indices, null) efa_indices = each.value.efa_indices
network_interfaces = try(each.value.network_interfaces, null) network_interfaces = each.value.network_interfaces
placement = try(each.value.placement, null) placement = each.value.placement
maintenance_options = try(each.value.maintenance_options, null) maintenance_options = each.value.maintenance_options
private_dns_name_options = try(each.value.private_dns_name_options, null) private_dns_name_options = each.value.private_dns_name_options
# IAM role # IAM role
create_iam_instance_profile = try(each.value.create_iam_instance_profile, null) create_iam_instance_profile = each.value.create_iam_instance_profile
iam_instance_profile_arn = try(each.value.iam_instance_profile_arn, null) iam_instance_profile_arn = each.value.iam_instance_profile_arn
iam_role_name = try(each.value.iam_role_name, null) iam_role_name = each.value.iam_role_name
iam_role_use_name_prefix = try(each.value.iam_role_use_name_prefix, true) iam_role_use_name_prefix = each.value.iam_role_use_name_prefix
iam_role_path = try(each.value.iam_role_path, null) iam_role_path = each.value.iam_role_path
iam_role_description = try(each.value.iam_role_description, null) iam_role_description = each.value.iam_role_description
iam_role_permissions_boundary = try(each.value.iam_role_permissions_boundary, null) iam_role_permissions_boundary = each.value.iam_role_permissions_boundary
iam_role_tags = try(each.value.iam_role_tags, null) iam_role_tags = each.value.iam_role_tags
iam_role_attach_cni_policy = try(each.value.iam_role_attach_cni_policy, null) iam_role_attach_cni_policy = each.value.iam_role_attach_cni_policy
iam_role_additional_policies = lookup(each.value, "iam_role_additional_policies", null) iam_role_additional_policies = lookup(each.value, "iam_role_additional_policies", null)
create_iam_role_policy = try(each.value.create_iam_role_policy, null) create_iam_role_policy = each.value.create_iam_role_policy
iam_role_policy_statements = try(each.value.iam_role_policy_statements, null) iam_role_policy_statements = each.value.iam_role_policy_statements
# Access entry # Access entry
create_access_entry = try(each.value.create_access_entry, null) create_access_entry = each.value.create_access_entry
iam_role_arn = try(each.value.iam_role_arn, null) iam_role_arn = each.value.iam_role_arn
# Security group # Security group
vpc_security_group_ids = compact(concat([local.node_security_group_id], try(each.value.vpc_security_group_ids, []))) vpc_security_group_ids = compact(concat([local.node_security_group_id], each.value.vpc_security_group_ids))
cluster_primary_security_group_id = try(each.value.attach_cluster_primary_security_group, false) ? aws_eks_cluster.this[0].vpc_config[0].cluster_security_group_id : null cluster_primary_security_group_id = each.value.attach_cluster_primary_security_group ? aws_eks_cluster.this[0].vpc_config[0].cluster_security_group_id : null
create_security_group = try(each.value.create_security_group, null) create_security_group = each.value.create_security_group
security_group_name = try(each.value.security_group_name, null) security_group_name = each.value.security_group_name
security_group_use_name_prefix = try(each.value.security_group_use_name_prefix, null) security_group_use_name_prefix = each.value.security_group_use_name_prefix
security_group_description = try(each.value.security_group_description, null) security_group_description = each.value.security_group_description
security_group_ingress_rules = try(each.value.security_group_ingress_rules, null) security_group_ingress_rules = each.value.security_group_ingress_rules
security_group_egress_rules = try(each.value.security_group_egress_rules, null) security_group_egress_rules = each.value.security_group_egress_rules
security_group_tags = try(each.value.security_group_tags, null) security_group_tags = each.value.security_group_tags
tags = merge( tags = merge(
var.tags, var.tags,
variables.tf
+4 -1
View File
@@ -785,7 +785,9 @@ variable "fargate_profiles" {
variable "self_managed_node_groups" { variable "self_managed_node_groups" {
description = "Map of self-managed node group definitions to create" description = "Map of self-managed node group definitions to create"
type = map(object({ type = map(object({
create = optional(bool, true) create = optional(bool)
kubernetes_version = optional(string)
# Autoscaling Group # Autoscaling Group
create_autoscaling_group = optional(bool) create_autoscaling_group = optional(bool)
name = optional(string) # Will fall back to map key name = optional(string) # Will fall back to map key
@@ -1159,6 +1161,7 @@ variable "self_managed_node_groups" {
create_access_entry = optional(bool) create_access_entry = optional(bool)
iam_role_arn = optional(string) iam_role_arn = optional(string)
# Security group # Security group
vpc_security_group_ids = optional(list(string), [])
attach_cluster_primary_security_group = optional(bool, false) attach_cluster_primary_security_group = optional(bool, false)
create_security_group = optional(bool) create_security_group = optional(bool)
security_group_name = optional(string) security_group_name = optional(string)