Skip to content

Commit b20c1a0

Browse files
bryantbiggsbryantbiggs
committed
chore: updates from testing, working as intended
1 parent c4a1ce5 commit b20c1a0

File tree

7 files changed

+21
-33
lines changed

7 files changed

+21
-33
lines changed

‎modules/eks-managed-node-group/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ module "eks_managed_node_group" {
7474
| [aws_launch_template.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template) | resource |
7575
| [aws_security_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
7676
| [aws_security_group_rule.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource |
77+
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
7778
| [aws_iam_policy_document.assume_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
7879
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |
7980

‎modules/eks-managed-node-group/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
data "aws_partition" "current" {}
22

3+
data "aws_caller_identity" "current" {}
4+
35
################################################################################
46
# User Data
57
################################################################################
@@ -393,7 +395,7 @@ locals {
393395

394396
iam_role_policy_prefix = "arn:${data.aws_partition.current.partition}:iam::aws:policy"
395397

396-
cni_policy = var.cluster_ip_family == "ipv6" ? "${local.iam_role_policy_prefix}/AmazonEKS_CNI_IPv6_Policy" : "${local.iam_role_policy_prefix}/AmazonEKS_CNI_Policy"
398+
cni_policy = var.cluster_ip_family == "ipv6" ? "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:policy/AmazonEKS_CNI_IPv6_Policy" : "${local.iam_role_policy_prefix}/AmazonEKS_CNI_Policy"
397399
}
398400

399401
data "aws_iam_policy_document" "assume_role_policy" {

‎modules/fargate-profile/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ No modules.
4848
| [aws_eks_fargate_profile.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_fargate_profile) | resource |
4949
| [aws_iam_role.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
5050
| [aws_iam_role_policy_attachment.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
51+
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
5152
| [aws_iam_policy_document.assume_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
5253
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |
5354

‎modules/fargate-profile/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
data "aws_partition" "current" {}
22

3+
data "aws_caller_identity" "current" {}
4+
35
locals {
46
iam_role_name = coalesce(var.iam_role_name, var.name, "fargate-profile")
57

68
iam_role_policy_prefix = "arn:${data.aws_partition.current.partition}:iam::aws:policy"
79

8-
cni_policy = var.cluster_ip_family == "ipv6" ? "${local.iam_role_policy_prefix}/AmazonEKS_CNI_IPv6_Policy" : "${local.iam_role_policy_prefix}/AmazonEKS_CNI_Policy"
10+
cni_policy = var.cluster_ip_family == "ipv6" ? "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:policy/AmazonEKS_CNI_IPv6_Policy" : "${local.iam_role_policy_prefix}/AmazonEKS_CNI_Policy"
911
}
1012

1113
################################################################################

‎modules/self-managed-node-group/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ module "self_managed_node_group" {
6868
| [aws_security_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
6969
| [aws_security_group_rule.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource |
7070
| [aws_ami.eks_default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
71+
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
7172
| [aws_iam_policy_document.assume_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
7273
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |
7374

‎modules/self-managed-node-group/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
data "aws_partition" "current" {}
22

3+
data "aws_caller_identity" "current" {}
4+
35
data "aws_ami" "eks_default" {
46
count = var.create ? 1 : 0
57

@@ -495,7 +497,7 @@ locals {
495497

496498
iam_role_policy_prefix = "arn:${data.aws_partition.current.partition}:iam::aws:policy"
497499

498-
cni_policy = var.cluster_ip_family == "ipv6" ? "${local.iam_role_policy_prefix}/AmazonEKS_CNI_IPv6_Policy" : "${local.iam_role_policy_prefix}/AmazonEKS_CNI_Policy"
500+
cni_policy = var.cluster_ip_family == "ipv6" ? "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:policy/AmazonEKS_CNI_IPv6_Policy" : "${local.iam_role_policy_prefix}/AmazonEKS_CNI_Policy"
499501
}
500502

501503
data "aws_iam_policy_document" "assume_role_policy" {

‎node_groups.tf

+9-30
Original file line numberDiff line numberDiff line change
@@ -116,53 +116,32 @@ locals {
116116
self = true
117117
}
118118
egress_https = {
119-
description = "Egress all HTTPS to internet"
120-
protocol = "tcp"
121-
from_port = 443
122-
to_port = 443
123-
type = "egress"
124-
cidr_blocks = ["0.0.0.0/0", ]
125-
}
126-
egress_https_ipv6 = { for k, v in {
127119
description = "Egress all HTTPS to internet"
128120
protocol = "tcp"
129121
from_port = 443
130122
to_port = 443
131123
type = "egress"
132-
ipv6_cidr_blocks = ["::/0"]
133-
} : k => v if var.cluster_ip_family == "ipv6" }
134-
egress_ntp_tcp = {
135-
description = "Egress NTP/TCP to internet"
136-
protocol = "tcp"
137-
from_port = 123
138-
to_port = 123
139-
type = "egress"
140-
cidr_blocks = ["0.0.0.0/0"]
124+
cidr_blocks = ["0.0.0.0/0"]
125+
ipv6_cidr_blocks = var.cluster_ip_family == "ipv6" ? ["::/0"] : null
141126
}
142-
egress_ntp_tcp_ipv6 = { for k, v in {
127+
egress_ntp_tcp = {
143128
description = "Egress NTP/TCP to internet"
144129
protocol = "tcp"
145130
from_port = 123
146131
to_port = 123
147132
type = "egress"
148-
ipv6_cidr_blocks = ["::/0"]
149-
} : k => v if var.cluster_ip_family == "ipv6" }
150-
egress_ntp_udp = {
151-
description = "Egress NTP/UDP to internet"
152-
protocol = "udp"
153-
from_port = 123
154-
to_port = 123
155-
type = "egress"
156-
cidr_blocks = ["0.0.0.0/0"]
133+
cidr_blocks = ["0.0.0.0/0"]
134+
ipv6_cidr_blocks = var.cluster_ip_family == "ipv6" ? ["::/0"] : null
157135
}
158-
egress_ntp_udp_ipv6 = { for k, v in {
136+
egress_ntp_udp = {
159137
description = "Egress NTP/UDP to internet"
160138
protocol = "udp"
161139
from_port = 123
162140
to_port = 123
163141
type = "egress"
164-
ipv6_cidr_blocks = ["::/0"]
165-
} : k => v if var.cluster_ip_family == "ipv6" }
142+
cidr_blocks = ["0.0.0.0/0"]
143+
ipv6_cidr_blocks = var.cluster_ip_family == "ipv6" ? ["::/0"] : null
144+
}
166145
}
167146
}
168147

0 commit comments

Comments
 (0)