diff --git a/README.md b/README.md index 42b1279612d..e05d8f565c2 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 3.22.0 | +| [aws](#requirement\_aws) | >= 3.35.0 | | [kubernetes](#requirement\_kubernetes) | >= 1.11.1 | | [local](#requirement\_local) | >= 1.4 | | [null](#requirement\_null) | >= 2.1 | @@ -156,7 +156,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.22.0 | +| [aws](#provider\_aws) | >= 3.35.0 | | [kubernetes](#provider\_kubernetes) | >= 1.11.1 | | [local](#provider\_local) | >= 1.4 | | [null](#provider\_null) | >= 2.1 | diff --git a/cluster.tf b/cluster.tf index d8ffa66a1e1..4306db30737 100644 --- a/cluster.tf +++ b/cluster.tf @@ -170,6 +170,7 @@ resource "aws_iam_policy" "cluster_elb_sl_role_creation" { description = "Permissions for EKS to create AWSServiceRoleForElasticLoadBalancing service-linked role" policy = data.aws_iam_policy_document.cluster_elb_sl_role_creation[0].json path = var.iam_path + tags = var.tags } resource "aws_iam_role_policy_attachment" "cluster_elb_sl_role_creation" { diff --git a/docs/autoscaling.md b/docs/autoscaling.md index 28d737f4181..c5ba6154335 100644 --- a/docs/autoscaling.md +++ b/docs/autoscaling.md @@ -21,6 +21,7 @@ resource "aws_iam_policy" "worker_autoscaling" { description = "EKS worker node autoscaling policy for cluster ${module.my_cluster.cluster_id}" policy = data.aws_iam_policy_document.worker_autoscaling.json path = var.iam_path + tags = var.tags } data "aws_iam_policy_document" "worker_autoscaling" { diff --git a/irsa.tf b/irsa.tf index 63a19871b5f..9c5d653a254 100644 --- a/irsa.tf +++ b/irsa.tf @@ -12,4 +12,11 @@ resource "aws_iam_openid_connect_provider" "oidc_provider" { client_id_list = [local.sts_principal] thumbprint_list = [var.eks_oidc_root_ca_thumbprint] url = flatten(concat(aws_eks_cluster.this[*].identity[*].oidc.0.issuer, [""]))[0] + + tags = merge( + { + Name = "${var.cluster_name}-eks-irsa" + }, + var.tags + ) } diff --git a/versions.tf b/versions.tf index f7aaf8d90cc..f2e54319704 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = ">= 0.13.1" required_providers { - aws = ">= 3.22.0" + aws = ">= 3.35.0" local = ">= 1.4" null = ">= 2.1" template = ">= 2.1" diff --git a/workers.tf b/workers.tf index 58fa3b23e26..2bd75a27fff 100644 --- a/workers.tf +++ b/workers.tf @@ -453,6 +453,7 @@ resource "aws_iam_instance_profile" "workers" { ) path = var.iam_path + tags = var.tags lifecycle { create_before_destroy = true diff --git a/workers_launch_template.tf b/workers_launch_template.tf index a7b5f62a40c..3b16ff163a9 100644 --- a/workers_launch_template.tf +++ b/workers_launch_template.tf @@ -563,6 +563,7 @@ resource "aws_iam_instance_profile" "workers_launch_template" { local.default_iam_role_id, ) path = var.iam_path + tags = var.tags lifecycle { create_before_destroy = true