Skip to content

Commit d922e7c

Browse files
Benbentwoclaude
andcommitted
fix: use aws_partition for policy ARNs in examples, rename capabilities to auto mode managed add-ons
- Add data.aws_partition.current to examples/complete for GovCloud/China partition support instead of hardcoded "arn:aws:" prefixes - Rename "Capabilities" section to "Auto Mode Managed Add-ons" in docs to avoid confusion with EKS Capabilities (Argo CD, ACK, KRO) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent a35c839 commit d922e7c

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,12 @@ When Auto Mode is enabled, this module automatically:
366366
- Attaches 4 additional IAM policies to the cluster role: `AmazonEKSComputePolicy`, `AmazonEKSBlockStoragePolicy`,
367367
`AmazonEKSLoadBalancingPolicy`, and `AmazonEKSNetworkingPolicy`
368368

369-
### Capabilities
369+
### Auto Mode Managed Add-ons
370370

371-
All three capabilities must be enabled or disabled together:
371+
When Auto Mode is enabled, AWS manages the following add-ons automatically:
372372

373-
| Capability | Variable | What AWS Manages |
374-
|-----------|----------|-----------------|
373+
| Add-on | Variable | What AWS Manages |
374+
|--------|----------|-----------------|
375375
| **Compute** | `auto_mode_compute_config` | Node provisioning via managed Karpenter |
376376
| **Storage** | `auto_mode_storage_config` | EBS volumes via `ebs.csi.eks.amazonaws.com` |
377377
| **Networking** | `auto_mode_elastic_load_balancing` | ALB/NLB for Services and Ingress |

README.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,12 @@ usage: |-
367367
- Attaches 4 additional IAM policies to the cluster role: `AmazonEKSComputePolicy`, `AmazonEKSBlockStoragePolicy`,
368368
`AmazonEKSLoadBalancingPolicy`, and `AmazonEKSNetworkingPolicy`
369369
370-
### Capabilities
370+
### Auto Mode Managed Add-ons
371371
372-
All three capabilities must be enabled or disabled together:
372+
When Auto Mode is enabled, AWS manages the following add-ons automatically:
373373
374-
| Capability | Variable | What AWS Manages |
375-
|-----------|----------|-----------------|
374+
| Add-on | Variable | What AWS Manages |
375+
|--------|----------|-----------------|
376376
| **Compute** | `auto_mode_compute_config` | Node provisioning via managed Karpenter |
377377
| **Storage** | `auto_mode_storage_config` | EBS volumes via `ebs.csi.eks.amazonaws.com` |
378378
| **Networking** | `auto_mode_elastic_load_balancing` | ALB/NLB for Services and Ingress |

examples/complete/main.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ provider "aws" {
22
region = var.region
33
}
44

5+
data "aws_partition" "current" {}
6+
57
module "label" {
68
source = "cloudposse/label/null"
79
version = "0.25.0"
@@ -180,14 +182,14 @@ resource "aws_iam_role_policy_attachment" "auto_mode_node_minimal" {
180182
count = local.enabled && var.auto_mode_enabled ? 1 : 0
181183

182184
role = one(aws_iam_role.auto_mode_node[*].name)
183-
policy_arn = "arn:aws:iam::aws:policy/AmazonEKSWorkerNodeMinimalPolicy"
185+
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonEKSWorkerNodeMinimalPolicy"
184186
}
185187

186188
resource "aws_iam_role_policy_attachment" "auto_mode_node_ecr" {
187189
count = local.enabled && var.auto_mode_enabled ? 1 : 0
188190

189191
role = one(aws_iam_role.auto_mode_node[*].name)
190-
policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
192+
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
191193
}
192194

193195
module "eks_node_group" {

examples/complete/vpc-cni.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ resource "aws_iam_role_policy_attachment" "vpc_cni" {
4242
count = local.vpc_cni_sa_needed ? 1 : 0
4343

4444
role = module.vpc_cni_eks_iam_role.service_account_role_name
45-
policy_arn = "arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"
45+
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonEKS_CNI_Policy"
4646
}
4747

4848
module "vpc_cni_eks_iam_role" {

0 commit comments

Comments
 (0)