Skip to content

Commit 0037165

Browse files
committed
added auth-config fixes
1 parent 43e17df commit 0037165

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

aws/autoscaler/karpenter/1.0/main.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,3 +337,15 @@ resource "aws_cloudwatch_event_target" "karpenter_interruption" {
337337
target_id = "KarpenterInterruptionQueue"
338338
arn = aws_sqs_queue.karpenter_interruption[0].arn
339339
}
340+
341+
# Add Karpenter node role to aws-auth ConfigMap using EKS access entry
342+
# This allows Karpenter-provisioned nodes to join the cluster
343+
resource "aws_eks_access_entry" "karpenter_node" {
344+
cluster_name = local.cluster_name
345+
principal_arn = aws_iam_role.karpenter_node.arn
346+
type = "EC2_LINUX"
347+
348+
depends_on = [
349+
aws_iam_role.karpenter_node
350+
]
351+
}

aws/autoscaler/karpenter/1.0/nodepools.tf

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,17 @@ resource "kubernetes_manifest" "node_pool" {
8888
operator = "In"
8989
values = lookup(each.value, "capacity_types", ["on-demand", "spot"])
9090
},
91+
# Use node.kubernetes.io/instance-type instead of restricted karpenter.k8s.aws labels
92+
# Generate list of instance types from families and sizes
9193
{
92-
key = "karpenter.k8s.aws/instance-family"
94+
key = "node.kubernetes.io/instance-type"
9395
operator = "In"
94-
values = lookup(each.value, "instance_families", ["t3", "t3a"])
95-
},
96-
{
97-
key = "karpenter.k8s.aws/instance-size"
98-
operator = "In"
99-
values = lookup(each.value, "instance_sizes", ["medium", "large", "xlarge"])
96+
values = flatten([
97+
for family in lookup(each.value, "instance_families", ["t3", "t3a"]) : [
98+
for size in lookup(each.value, "instance_sizes", ["medium", "large", "xlarge"]) :
99+
"${family}.${size}"
100+
]
101+
])
100102
}
101103
],
102104
[]
@@ -136,4 +138,4 @@ resource "kubernetes_manifest" "node_pool" {
136138
depends_on = [
137139
kubernetes_manifest.ec2_node_class
138140
]
139-
}
141+
}

0 commit comments

Comments
 (0)