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

feat: Add node_iam_role_arns local variable to check for Windows platform on EKS managed nodegroups (#2477)

Browse Source 
Update node_iam_role_arns locals to check for Windows Managed Node Groups

Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>
This commit is contained in:
Angel Moctezuma
2023-08-03 16:23:36 -07:00
committed by GitHub
parent d4e6c153ad
commit adb47f46dc
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main.tf
View File

@@ -469,7 +469,7 @@ locals {
node_iam_role_arns_non_windows = distinct( node_iam_role_arns_non_windows = distinct(
compact( compact(
concat( concat(
[for group in module.eks_managed_node_group : group.iam_role_arn], [for group in module.eks_managed_node_group : group.iam_role_arn if group.platform != "windows"],
[for group in module.self_managed_node_group : group.iam_role_arn if group.platform != "windows"], [for group in module.self_managed_node_group : group.iam_role_arn if group.platform != "windows"],
var.aws_auth_node_iam_role_arns_non_windows, var.aws_auth_node_iam_role_arns_non_windows,
) )
@@ -479,6 +479,7 @@ locals {
node_iam_role_arns_windows = distinct( node_iam_role_arns_windows = distinct(
compact( compact(
concat( concat(
[for group in module.eks_managed_node_group : group.iam_role_arn if group.platform == "windows"],
[for group in module.self_managed_node_group : group.iam_role_arn if group.platform == "windows"], [for group in module.self_managed_node_group : group.iam_role_arn if group.platform == "windows"],
var.aws_auth_node_iam_role_arns_windows, var.aws_auth_node_iam_role_arns_windows,
) )

1
modules/eks-managed-node-group/README.md
View File

@@ -193,4 +193,5 @@ module "eks_managed_node_group" {
| <a name="output_node_group_resources"></a> [node\_group\_resources](#output\_node\_group\_resources) | List of objects containing information about underlying resources | | <a name="output_node_group_resources"></a> [node\_group\_resources](#output\_node\_group\_resources) | List of objects containing information about underlying resources |
| <a name="output_node_group_status"></a> [node\_group\_status](#output\_node\_group\_status) | Status of the EKS Node Group | | <a name="output_node_group_status"></a> [node\_group\_status](#output\_node\_group\_status) | Status of the EKS Node Group |
| <a name="output_node_group_taints"></a> [node\_group\_taints](#output\_node\_group\_taints) | List of objects containing information about taints applied to the node group | | <a name="output_node_group_taints"></a> [node\_group\_taints](#output\_node\_group\_taints) | List of objects containing information about taints applied to the node group |
| <a name="output_platform"></a> [platform](#output\_platform) | Identifies if the OS platform is `bottlerocket`, `linux`, or `windows` based |
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK --> <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

9
modules/eks-managed-node-group/outputs.tf
View File

@@ -88,3 +88,12 @@ output "iam_role_unique_id" {
description = "Stable and unique string identifying the IAM role" description = "Stable and unique string identifying the IAM role"
value = try(aws_iam_role.this[0].unique_id, null) value = try(aws_iam_role.this[0].unique_id, null)
} }
################################################################################
# Additional
################################################################################
output "platform" {
description = "Identifies if the OS platform is `bottlerocket`, `linux`, or `windows` based"
value = var.platform
}