Skip to content

Commit c7240ff

Browse files
committed
fix: streamline EKS node group output values and utilize local variable for auto mode
1 parent f17e7e4 commit c7240ff

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

examples/complete/main.tf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ data "aws_iam_session_context" "current" {
2020
locals {
2121
enabled = module.this.enabled
2222

23+
auto_mode_enabled = var.cluster_auto_mode_enabled
24+
2325
private_ipv6_enabled = var.private_ipv6_enabled
2426

2527
# The usage of the specific kubernetes.io/cluster/* resource tags below are required
@@ -114,12 +116,12 @@ module "eks_cluster" {
114116
addons_depends_on = [module.eks_node_group]
115117
bootstrap_self_managed_addons_enabled = var.bootstrap_self_managed_addons_enabled
116118
upgrade_policy = var.upgrade_policy
117-
zonal_shift_config = var.zonal_shift_config
119+
zonal_shift_config = var.zonal_shift_config
118120

119-
cluster_auto_mode_enabled = var.cluster_auto_mode_enabled
121+
cluster_auto_mode_enabled = local.auto_mode_enabled
120122

121-
create_node_role = var.create_node_role
122-
node_pools = var.node_pools
123+
create_node_role = var.create_node_role
124+
node_pools = var.node_pools
123125

124126
access_entry_map = local.access_entry_map
125127
access_config = {
@@ -140,7 +142,7 @@ module "eks_cluster" {
140142
}
141143

142144
module "eks_node_group" {
143-
count = var.cluster_auto_mode_enabled ? 0 : 1
145+
enabled = local.auto_mode_enabled
144146
source = "cloudposse/eks-node-group/aws"
145147
version = "3.2.0"
146148

examples/complete/outputs.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,30 +53,30 @@ output "eks_cluster_ipv6_service_cidr" {
5353

5454
output "eks_node_group_role_arn" {
5555
description = "ARN of the worker nodes IAM role"
56-
value = try(module.eks_node_group[0].eks_node_group_role_arn, null)
56+
value = module.eks_node_group.eks_node_group_role_arn
5757
}
5858

5959
output "eks_node_group_role_name" {
6060
description = "Name of the worker nodes IAM role"
61-
value = try(module.eks_node_group[0].eks_node_group_role_name, null)
61+
value = module.eks_node_group.eks_node_group_role_name
6262
}
6363

6464
output "eks_node_group_id" {
6565
description = "EKS Cluster name and EKS Node Group name separated by a colon"
66-
value = try(module.eks_node_group[0].eks_node_group_id, null)
66+
value = module.eks_node_group.eks_node_group_id
6767
}
6868

6969
output "eks_node_group_arn" {
7070
description = "Amazon Resource Name (ARN) of the EKS Node Group"
71-
value = try(module.eks_node_group[0].eks_node_group_arn, null)
71+
value = module.eks_node_group.eks_node_group_arn
7272
}
7373

7474
output "eks_node_group_resources" {
7575
description = "List of objects containing information about underlying resources of the EKS Node Group"
76-
value = try(module.eks_node_group[0].eks_node_group_resources, [])
76+
value = module.eks_node_group.eks_node_group_resources
7777
}
7878

7979
output "eks_node_group_status" {
8080
description = "Status of the EKS Node Group"
81-
value = try(module.eks_node_group[0].eks_node_group_status, null)
81+
value = module.eks_node_group.eks_node_group_status
8282
}

0 commit comments

Comments
 (0)