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

feat: Add support for addon and identity provider custom tags (#2938)

Browse Source 
feat: Add support for addon and OIDC provider custom tags
This commit is contained in:
Bryant Biggs
2024-02-21 17:33:59 -05:00
committed by GitHub
parent 0d468bd432
commit f6255c49e4
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main.tf
View File

@@ -481,6 +481,14 @@ resource "aws_iam_policy" "cluster_encryption" {
# EKS Addons # EKS Addons
################################################################################ ################################################################################
data "aws_eks_addon_version" "this" {
for_each = { for k, v in var.cluster_addons : k => v if local.create && !local.create_outposts_local_cluster }
addon_name = try(each.value.name, each.key)
kubernetes_version = coalesce(var.cluster_version, aws_eks_cluster.this[0].version)
most_recent = try(each.value.most_recent, null)
}
resource "aws_eks_addon" "this" { resource "aws_eks_addon" "this" {
# Not supported on outposts # Not supported on outposts
for_each = { for k, v in var.cluster_addons : k => v if !try(v.before_compute, false) && local.create && !local.create_outposts_local_cluster } for_each = { for k, v in var.cluster_addons : k => v if !try(v.before_compute, false) && local.create && !local.create_outposts_local_cluster }
@@ -507,7 +515,7 @@ resource "aws_eks_addon" "this" {
module.self_managed_node_group, module.self_managed_node_group,
] ]
tags = var.tags tags = merge(var.tags, try(each.value.tags, {}))
} }
resource "aws_eks_addon" "before_compute" { resource "aws_eks_addon" "before_compute" {
@@ -530,15 +538,7 @@ resource "aws_eks_addon" "before_compute" {
delete = try(each.value.timeouts.delete, var.cluster_addons_timeouts.delete, null) delete = try(each.value.timeouts.delete, var.cluster_addons_timeouts.delete, null)
} }
tags = var.tags tags = merge(var.tags, try(each.value.tags, {}))
}
data "aws_eks_addon_version" "this" {
for_each = { for k, v in var.cluster_addons : k => v if local.create && !local.create_outposts_local_cluster }
addon_name = try(each.value.name, each.key)
kubernetes_version = coalesce(var.cluster_version, aws_eks_cluster.this[0].version)
most_recent = try(each.value.most_recent, null)
} }
################################################################################ ################################################################################
@@ -562,5 +562,5 @@ resource "aws_eks_identity_provider_config" "this" {
username_prefix = lookup(each.value, "username_prefix", null) username_prefix = lookup(each.value, "username_prefix", null)
} }
tags = var.tags tags = merge(var.tags, try(each.value.tags, {}))
} }