Skip to content

Commit 131db39

Browse files
authored
feat: Update Karpenter controller policy and permissions to match upstream project (#3510)
1 parent b9e7ad0 commit 131db39

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

modules/karpenter/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ resource "aws_iam_role_policy_attachment" "node" {
297297
for_each = { for k, v in merge(
298298
{
299299
AmazonEKSWorkerNodePolicy = "${local.node_iam_role_policy_prefix}/AmazonEKSWorkerNodePolicy"
300-
AmazonEC2ContainerRegistryReadOnly = "${local.node_iam_role_policy_prefix}/AmazonEC2ContainerRegistryReadOnly"
300+
AmazonEC2ContainerRegistryPullOnly = "${local.node_iam_role_policy_prefix}/AmazonEC2ContainerRegistryPullOnly"
301301
},
302302
local.ipv4_cni_policy,
303303
local.ipv6_cni_policy

modules/karpenter/policy.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ data "aws_iam_policy_document" "controller" {
5050
"arn:${local.partition}:ec2:${local.region}:*:network-interface/*",
5151
"arn:${local.partition}:ec2:${local.region}:*:launch-template/*",
5252
"arn:${local.partition}:ec2:${local.region}:*:spot-instances-request/*",
53+
"arn:${local.partition}:ec2:${local.region}:*:capacity-reservation/*"
5354
]
5455
actions = [
5556
"ec2:RunInstances",
@@ -348,6 +349,12 @@ data "aws_iam_policy_document" "controller" {
348349
actions = ["iam:GetInstanceProfile"]
349350
}
350351

352+
statement {
353+
sid = "AllowUnscopedInstanceProfileListAction"
354+
resources = ["*"]
355+
actions = ["iam:ListInstanceProfiles"]
356+
}
357+
351358
statement {
352359
sid = "AllowAPIServerEndpointDiscovery"
353360
resources = ["arn:${local.partition}:eks:${local.region}:${local.account_id}:cluster/${var.cluster_name}"]

0 commit comments

Comments
 (0)