Skip to content

Commit 7a83b1b

Browse files
authored
fix: Ensure additional_cluster_dns_ips is passed through from root module (#3376)
fix: add missing additional_cluster_dns_ips to node_group module
1 parent 37e3348 commit 7a83b1b

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

node_groups.tf

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -479,17 +479,18 @@ module "self_managed_node_group" {
479479
# User data
480480
platform = try(each.value.platform, var.self_managed_node_group_defaults.platform, null)
481481
# TODO - update this when `var.platform` is removed in v21.0
482-
ami_type = try(each.value.ami_type, var.self_managed_node_group_defaults.ami_type, "AL2_x86_64")
483-
cluster_endpoint = try(time_sleep.this[0].triggers["cluster_endpoint"], "")
484-
cluster_auth_base64 = try(time_sleep.this[0].triggers["cluster_certificate_authority_data"], "")
485-
cluster_service_cidr = try(time_sleep.this[0].triggers["cluster_service_cidr"], "")
486-
cluster_ip_family = var.cluster_ip_family
487-
pre_bootstrap_user_data = try(each.value.pre_bootstrap_user_data, var.self_managed_node_group_defaults.pre_bootstrap_user_data, "")
488-
post_bootstrap_user_data = try(each.value.post_bootstrap_user_data, var.self_managed_node_group_defaults.post_bootstrap_user_data, "")
489-
bootstrap_extra_args = try(each.value.bootstrap_extra_args, var.self_managed_node_group_defaults.bootstrap_extra_args, "")
490-
user_data_template_path = try(each.value.user_data_template_path, var.self_managed_node_group_defaults.user_data_template_path, "")
491-
cloudinit_pre_nodeadm = try(each.value.cloudinit_pre_nodeadm, var.self_managed_node_group_defaults.cloudinit_pre_nodeadm, [])
492-
cloudinit_post_nodeadm = try(each.value.cloudinit_post_nodeadm, var.self_managed_node_group_defaults.cloudinit_post_nodeadm, [])
482+
ami_type = try(each.value.ami_type, var.self_managed_node_group_defaults.ami_type, "AL2_x86_64")
483+
cluster_endpoint = try(time_sleep.this[0].triggers["cluster_endpoint"], "")
484+
cluster_auth_base64 = try(time_sleep.this[0].triggers["cluster_certificate_authority_data"], "")
485+
cluster_service_cidr = try(time_sleep.this[0].triggers["cluster_service_cidr"], "")
486+
additional_cluster_dns_ips = try(each.value.additional_cluster_dns_ips, var.self_managed_node_group_defaults.additional_cluster_dns_ips, [])
487+
cluster_ip_family = var.cluster_ip_family
488+
pre_bootstrap_user_data = try(each.value.pre_bootstrap_user_data, var.self_managed_node_group_defaults.pre_bootstrap_user_data, "")
489+
post_bootstrap_user_data = try(each.value.post_bootstrap_user_data, var.self_managed_node_group_defaults.post_bootstrap_user_data, "")
490+
bootstrap_extra_args = try(each.value.bootstrap_extra_args, var.self_managed_node_group_defaults.bootstrap_extra_args, "")
491+
user_data_template_path = try(each.value.user_data_template_path, var.self_managed_node_group_defaults.user_data_template_path, "")
492+
cloudinit_pre_nodeadm = try(each.value.cloudinit_pre_nodeadm, var.self_managed_node_group_defaults.cloudinit_pre_nodeadm, [])
493+
cloudinit_post_nodeadm = try(each.value.cloudinit_post_nodeadm, var.self_managed_node_group_defaults.cloudinit_post_nodeadm, [])
493494

494495
# Launch Template
495496
create_launch_template = try(each.value.create_launch_template, var.self_managed_node_group_defaults.create_launch_template, true)

0 commit comments

Comments
 (0)