github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-01-17 17:22:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: Replace the use of toset() with static keys for node IAM role policy attachment (#2962)

Browse Source
This commit is contained in:
Bryant Biggs
2024-03-10 12:49:41 -04:00
committed by GitHub
parent bed26ac421
commit 57f5130132
6 changed files with 80 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/eks-managed-node-group/main.tf
View File

@@ -504,11 +504,12 @@ resource "aws_iam_role" "this" {
# Policies attached ref https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group # Policies attached ref https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group
resource "aws_iam_role_policy_attachment" "this" { resource "aws_iam_role_policy_attachment" "this" {
for_each = { for k, v in toset(compact([ for_each = { for k, v in {
"${local.iam_role_policy_prefix}/AmazonEKSWorkerNodePolicy", AmazonEKSWorkerNodePolicy = "${local.iam_role_policy_prefix}/AmazonEKSWorkerNodePolicy"
"${local.iam_role_policy_prefix}/AmazonEC2ContainerRegistryReadOnly", AmazonEC2ContainerRegistryReadOnly = "${local.iam_role_policy_prefix}/AmazonEC2ContainerRegistryReadOnly"
var.iam_role_attach_cni_policy ? local.cni_policy : "", AmazonEKS_CNI_IPv6_Policy = var.iam_role_attach_cni_policy && var.cluster_ip_family == "ipv6" ? local.cni_policy : ""
])) : k => v if var.create && var.create_iam_role } AmazonEKS_CNI_Policy = var.iam_role_attach_cni_policy && var.cluster_ip_family == "ipv4" ? local.cni_policy : ""
} : k => v if var.create && var.create_iam_role && v != "" }
policy_arn = each.value policy_arn = each.value
role = aws_iam_role.this[0].name role = aws_iam_role.this[0].name

20
modules/eks-managed-node-group/migrations.tf Normal file
View File

@@ -0,0 +1,20 @@
################################################################################
# Migrations: v20.7 -> v20.8
################################################################################
# Node IAM role policy attachment
# Commercial partition only - `moved` does now allow multiple moves to same target
moved {
from = aws_iam_role_policy_attachment.this["arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"]
to = aws_iam_role_policy_attachment.this["AmazonEKSWorkerNodePolicy"]
}
moved {
from = aws_iam_role_policy_attachment.this["arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"]
to = aws_iam_role_policy_attachment.this["AmazonEC2ContainerRegistryReadOnly"]
}
moved {
from = aws_iam_role_policy_attachment.this["arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"]
to = aws_iam_role_policy_attachment.this["AmazonEKS_CNI_Policy"]
}

11
modules/karpenter/main.tf
View File

@@ -565,11 +565,12 @@ resource "aws_iam_role" "node" {
# Policies attached ref https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group # Policies attached ref https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group
resource "aws_iam_role_policy_attachment" "node" { resource "aws_iam_role_policy_attachment" "node" {
for_each = { for k, v in toset(compact([ for_each = { for k, v in {
"${local.node_iam_role_policy_prefix}/AmazonEKSWorkerNodePolicy", AmazonEKSWorkerNodePolicy = "${local.node_iam_role_policy_prefix}/AmazonEKSWorkerNodePolicy"
"${local.node_iam_role_policy_prefix}/AmazonEC2ContainerRegistryReadOnly", AmazonEC2ContainerRegistryReadOnly = "${local.node_iam_role_policy_prefix}/AmazonEC2ContainerRegistryReadOnly"
var.node_iam_role_attach_cni_policy ? local.cni_policy : "", AmazonEKS_CNI_IPv6_Policy = var.node_iam_role_attach_cni_policy && var.cluster_ip_family == "ipv6" ? local.cni_policy : ""
])) : k => v if local.create_node_iam_role } AmazonEKS_CNI_Policy = var.node_iam_role_attach_cni_policy && var.cluster_ip_family == "ipv4" ? local.cni_policy : ""
} : k => v if var.create && var.create_iam_role && v != "" }
policy_arn = each.value policy_arn = each.value
role = aws_iam_role.node[0].name role = aws_iam_role.node[0].name

21
modules/karpenter/migrations.tf
View File

@@ -54,3 +54,24 @@ moved {
from = aws_cloudwatch_event_rule.this["spot_interupt"] from = aws_cloudwatch_event_rule.this["spot_interupt"]
to = aws_cloudwatch_event_rule.this["spot_interrupt"] to = aws_cloudwatch_event_rule.this["spot_interrupt"]
} }
################################################################################
# Migrations: v20.7 -> v20.8
################################################################################
# Node IAM role policy attachment
# Commercial partition only - `moved` does now allow multiple moves to same target
moved {
from = aws_iam_role_policy_attachment.node["arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"]
to = aws_iam_role_policy_attachment.node["AmazonEKSWorkerNodePolicy"]
}
moved {
from = aws_iam_role_policy_attachment.node["arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"]
to = aws_iam_role_policy_attachment.node["AmazonEC2ContainerRegistryReadOnly"]
}
moved {
from = aws_iam_role_policy_attachment.node["arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"]
to = aws_iam_role_policy_attachment.node["AmazonEKS_CNI_Policy"]
}

12
modules/self-managed-node-group/main.tf
View File

@@ -768,12 +768,14 @@ resource "aws_iam_role" "this" {
tags = merge(var.tags, var.iam_role_tags) tags = merge(var.tags, var.iam_role_tags)
} }
# Policies attached ref https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group
resource "aws_iam_role_policy_attachment" "this" { resource "aws_iam_role_policy_attachment" "this" {
for_each = { for k, v in toset(compact([ for_each = { for k, v in {
"${local.iam_role_policy_prefix}/AmazonEKSWorkerNodePolicy", AmazonEKSWorkerNodePolicy = "${local.iam_role_policy_prefix}/AmazonEKSWorkerNodePolicy"
"${local.iam_role_policy_prefix}/AmazonEC2ContainerRegistryReadOnly", AmazonEC2ContainerRegistryReadOnly = "${local.iam_role_policy_prefix}/AmazonEC2ContainerRegistryReadOnly"
var.iam_role_attach_cni_policy ? local.cni_policy : "", AmazonEKS_CNI_IPv6_Policy = var.iam_role_attach_cni_policy && var.cluster_ip_family == "ipv6" ? local.cni_policy : ""
])) : k => v if var.create && var.create_iam_instance_profile } AmazonEKS_CNI_Policy = var.iam_role_attach_cni_policy && var.cluster_ip_family == "ipv4" ? local.cni_policy : ""
} : k => v if var.create && var.create_iam_instance_profile && v != "" }
policy_arn = each.value policy_arn = each.value
role = aws_iam_role.this[0].name role = aws_iam_role.this[0].name

20
modules/self-managed-node-group/migrations.tf Normal file
View File

@@ -0,0 +1,20 @@
################################################################################
# Migrations: v20.7 -> v20.8
################################################################################
# Node IAM role policy attachment
# Commercial partition only - `moved` does now allow multiple moves to same target
moved {
from = aws_iam_role_policy_attachment.this["arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"]
to = aws_iam_role_policy_attachment.this["AmazonEKSWorkerNodePolicy"]
}
moved {
from = aws_iam_role_policy_attachment.this["arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"]
to = aws_iam_role_policy_attachment.this["AmazonEC2ContainerRegistryReadOnly"]
}
moved {
from = aws_iam_role_policy_attachment.this["arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"]
to = aws_iam_role_policy_attachment.this["AmazonEKS_CNI_Policy"]
}