Skip to content

fix: lookup-safe access for optional cluster_addons + additional_node_policies (RULE-015) #350

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.

Sign up for GitHub

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

Merged
unni-facets merged 1 commit into from
Jun 3, 2026
Merged

fix: lookup-safe access for optional cluster_addons + additional_node_policies (RULE-015) #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 modules/karpenter/default/1.0/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ resource "aws_iam_role_policy_attachment" "karpenter_node_policies" {
"arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy",
"arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly",
"arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
], [for policy in values(var.instance.spec.additional_node_policies) : policy.arn]))
], [for policy in values(lookup(var.instance.spec, "additional_node_policies", {})) : policy.arn]))

role = aws_iam_role.karpenter_node.name
policy_arn = each.value
Expand Down
28 changes: 17 additions & 11 deletions modules/kubernetes_cluster/eks_standard/1.0/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,37 @@ locals {
# Only the default system node group
eks_managed_node_groups = local.default_system_node_group

# cluster_addons is an OPTIONAL spec field (only cluster_version is required). Default to {}
# so an omitted block doesn't crash on direct attribute access — RULE-015. The per-addon
# `enabled`/`version` defaults below then apply, so omitting cluster_addons enables all
# default addons (matching the schema/UI defaults).
cluster_addons_spec = lookup(var.instance.spec, "cluster_addons", {})

# Check if EBS CSI driver addon is enabled (default: true)
ebs_csi_enabled = lookup(lookup(var.instance.spec.cluster_addons, "ebs_csi", {}), "enabled", true)
ebs_csi_enabled = lookup(lookup(local.cluster_addons_spec, "ebs_csi", {}), "enabled", true)

# Build cluster addons configuration - default addons
default_addons = {
vpc-cni = lookup(var.instance.spec.cluster_addons.vpc_cni, "enabled", true) ? {
addon_version = lookup(var.instance.spec.cluster_addons.vpc_cni, "version", "latest") == "latest" ? null : lookup(var.instance.spec.cluster_addons.vpc_cni, "version", null)
vpc-cni = lookup(lookup(local.cluster_addons_spec, "vpc_cni", {}), "enabled", true) ? {
addon_version = lookup(lookup(local.cluster_addons_spec, "vpc_cni", {}), "version", "latest") == "latest" ? null : lookup(lookup(local.cluster_addons_spec, "vpc_cni", {}), "version", null)
resolve_conflicts = "OVERWRITE"
service_account_role_arn = null
} : null

kube-proxy = lookup(var.instance.spec.cluster_addons.kube_proxy, "enabled", true) ? {
addon_version = lookup(var.instance.spec.cluster_addons.kube_proxy, "version", "latest") == "latest" ? null : lookup(var.instance.spec.cluster_addons.kube_proxy, "version", null)
kube-proxy = lookup(lookup(local.cluster_addons_spec, "kube_proxy", {}), "enabled", true) ? {
addon_version = lookup(lookup(local.cluster_addons_spec, "kube_proxy", {}), "version", "latest") == "latest" ? null : lookup(lookup(local.cluster_addons_spec, "kube_proxy", {}), "version", null)
resolve_conflicts = "OVERWRITE"
service_account_role_arn = null
} : null

coredns = lookup(var.instance.spec.cluster_addons.coredns, "enabled", true) ? {
addon_version = lookup(var.instance.spec.cluster_addons.coredns, "version", "latest") == "latest" ? null : lookup(var.instance.spec.cluster_addons.coredns, "version", null)
coredns = lookup(lookup(local.cluster_addons_spec, "coredns", {}), "enabled", true) ? {
addon_version = lookup(lookup(local.cluster_addons_spec, "coredns", {}), "version", "latest") == "latest" ? null : lookup(lookup(local.cluster_addons_spec, "coredns", {}), "version", null)
resolve_conflicts = "OVERWRITE"
service_account_role_arn = null
} : null

aws-ebs-csi-driver = local.ebs_csi_enabled ? {
addon_version = lookup(lookup(var.instance.spec.cluster_addons, "ebs_csi", {}), "version", "latest") == "latest" ? null : lookup(lookup(var.instance.spec.cluster_addons, "ebs_csi", {}), "version", null)
addon_version = lookup(lookup(local.cluster_addons_spec, "ebs_csi", {}), "version", "latest") == "latest" ? null : lookup(lookup(local.cluster_addons_spec, "ebs_csi", {}), "version", null)
resolve_conflicts = "OVERWRITE"
service_account_role_arn = aws_iam_role.ebs_csi_driver[0].arn
} : null
Expand All @@ -87,16 +93,16 @@ locals {
service_account_role_arn = local.needs_cloudwatch_iam_policy ? aws_iam_role.cloudwatch_agent_irsa[0].arn : null
} : null

metrics-server = lookup(lookup(var.instance.spec.cluster_addons, "metrics_server", {}), "enabled", true) ? {
addon_version = lookup(lookup(var.instance.spec.cluster_addons, "metrics_server", {}), "version", "latest") == "latest" ? null : lookup(lookup(var.instance.spec.cluster_addons, "metrics_server", {}), "version", null)
metrics-server = lookup(lookup(local.cluster_addons_spec, "metrics_server", {}), "enabled", true) ? {
addon_version = lookup(lookup(local.cluster_addons_spec, "metrics_server", {}), "version", "latest") == "latest" ? null : lookup(lookup(local.cluster_addons_spec, "metrics_server", {}), "version", null)
resolve_conflicts = "OVERWRITE"
service_account_role_arn = null
} : null
}

# Build additional/custom addons configuration
additional_addons = {
for addon_name, addon_config in lookup(var.instance.spec.cluster_addons, "additional_addons", {}) :
for addon_name, addon_config in lookup(local.cluster_addons_spec, "additional_addons", {}) :
addon_name => lookup(addon_config, "enabled", true) ? {
addon_version = lookup(addon_config, "version", "latest") == "latest" ? null : lookup(addon_config, "version", null)
resolve_conflicts = "OVERWRITE"
Expand Down