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

fix: Wrong rolearn in aws_auth_configmap_yaml (#1820)

Browse Source
This commit is contained in:
Kaji
2022-02-02 03:21:51 +09:00
committed by GitHub
parent b38124bd54
commit 776009d74b
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/complete/main.tf
View File

@@ -309,7 +309,7 @@ locals {
groups: groups:
- system:bootstrappers - system:bootstrappers
- system:nodes - system:nodes
- rolearn: ${module.fargate_profile.fargate_profile_arn} - rolearn: ${module.fargate_profile.fargate_profile_pod_execution_role_arn}
username: system:node:{{SessionName}} username: system:node:{{SessionName}}
groups: groups:
- system:bootstrappers - system:bootstrappers

1
modules/fargate-profile/README.md
View File

@@ -81,6 +81,7 @@ No modules.
|------|-------------| |------|-------------|
| <a name="output_fargate_profile_arn"></a> [fargate\_profile\_arn](#output\_fargate\_profile\_arn) | Amazon Resource Name (ARN) of the EKS Fargate Profile | | <a name="output_fargate_profile_arn"></a> [fargate\_profile\_arn](#output\_fargate\_profile\_arn) | Amazon Resource Name (ARN) of the EKS Fargate Profile |
| <a name="output_fargate_profile_id"></a> [fargate\_profile\_id](#output\_fargate\_profile\_id) | EKS Cluster name and EKS Fargate Profile name separated by a colon (`:`) | | <a name="output_fargate_profile_id"></a> [fargate\_profile\_id](#output\_fargate\_profile\_id) | EKS Cluster name and EKS Fargate Profile name separated by a colon (`:`) |
| <a name="output_fargate_profile_pod_execution_role_arn"></a> [fargate\_profile\_pod\_execution\_role\_arn](#output\_fargate\_profile\_pod\_execution\_role\_arn) | Amazon Resource Name (ARN) of the EKS Fargate Profile Pod execution role ARN |
| <a name="output_fargate_profile_status"></a> [fargate\_profile\_status](#output\_fargate\_profile\_status) | Status of the EKS Fargate Profile | | <a name="output_fargate_profile_status"></a> [fargate\_profile\_status](#output\_fargate\_profile\_status) | Status of the EKS Fargate Profile |
| <a name="output_iam_role_arn"></a> [iam\_role\_arn](#output\_iam\_role\_arn) | The Amazon Resource Name (ARN) specifying the IAM role | | <a name="output_iam_role_arn"></a> [iam\_role\_arn](#output\_iam\_role\_arn) | The Amazon Resource Name (ARN) specifying the IAM role |
| <a name="output_iam_role_name"></a> [iam\_role\_name](#output\_iam\_role\_name) | The name of the IAM role | | <a name="output_iam_role_name"></a> [iam\_role\_name](#output\_iam\_role\_name) | The name of the IAM role |

5
modules/fargate-profile/outputs.tf
View File

@@ -35,3 +35,8 @@ output "fargate_profile_status" {
description = "Status of the EKS Fargate Profile" description = "Status of the EKS Fargate Profile"
value = try(aws_eks_fargate_profile.this[0].status, "") value = try(aws_eks_fargate_profile.this[0].status, "")
} }
output "fargate_profile_pod_execution_role_arn" {
description = "Amazon Resource Name (ARN) of the EKS Fargate Profile Pod execution role ARN"
value = try(aws_eks_fargate_profile.this[0].pod_execution_role_arn, "")
}

8
outputs.tf
View File

@@ -165,10 +165,10 @@ output "aws_auth_configmap_yaml" {
description = "Formatted yaml output for base aws-auth configmap containing roles used in cluster node groups/fargate profiles" description = "Formatted yaml output for base aws-auth configmap containing roles used in cluster node groups/fargate profiles"
value = templatefile("${path.module}/templates/aws_auth_cm.tpl", value = templatefile("${path.module}/templates/aws_auth_cm.tpl",
{ {
eks_managed_role_arns = [for group in module.eks_managed_node_group : group.iam_role_arn] eks_managed_role_arns = [for group in module.eks_managed_node_group : group.iam_role_arn]
self_managed_role_arns = [for group in module.self_managed_node_group : group.iam_role_arn if group.platform != "windows"] self_managed_role_arns = [for group in module.self_managed_node_group : group.iam_role_arn if group.platform != "windows"]
win32_self_managed_role_arns = [for group in module.self_managed_node_group : group.iam_role_arn if group.platform == "windows"] win32_self_managed_role_arns = [for group in module.self_managed_node_group : group.iam_role_arn if group.platform == "windows"]
fargate_profile_arns = [for group in module.fargate_profile : group.fargate_profile_arn] fargate_profile_pod_execution_role_arns = [for group in module.fargate_profile : group.fargate_profile_pod_execution_role_arn]
} }
) )
} }

2
templates/aws_auth_cm.tpl
View File

@@ -27,7 +27,7 @@ data:
- system:bootstrappers - system:bootstrappers
- system:nodes - system:nodes
%{ endfor ~} %{ endfor ~}
%{ for role in fargate_profile_arns ~} %{ for role in fargate_profile_pod_execution_role_arns ~}
- rolearn: ${role} - rolearn: ${role}
username: system:node:{{SessionName}} username: system:node:{{SessionName}}
groups: groups: