diff --git a/examples/full-cluster-tf-upgrade/ebs-encryption.tf b/examples/full-cluster-tf-upgrade/ebs-encryption.tf index 7890df5..c67da2a 100644 --- a/examples/full-cluster-tf-upgrade/ebs-encryption.tf +++ b/examples/full-cluster-tf-upgrade/ebs-encryption.tf @@ -1,3 +1,8 @@ +locals { + _app_tags_sc_parameters = [for k, v in var.application_tags : format("%v=%v", k, v)] + app_tags_sc_parameters = { for i in range(0, length(local._app_tags_sc_parameters)) : format("tagSpecification_%v", i + 1) => local._app_tags_sc_parameters[i] } +} + resource "kubernetes_storage_class" "ebs_encrypted" { metadata { name = "gp2-encrypted" @@ -5,13 +10,15 @@ resource "kubernetes_storage_class" "ebs_encrypted" { "storageclass.kubernetes.io/is-default-class" = "true" } } - parameters = { - fsType = "ext4" - type = "gp2" - encrypted = "true" - # kms_key_id = data.aws_kms_key.ebs_key.arn - kmsKeyId = data.aws_kms_key.ebs_key.arn - } + parameters = merge( + local.app_tags_sc_parameters, + { + fsType = "ext4" + type = "gp2" + encrypted = "true" + # kms_key_id = data.aws_kms_key.ebs_key.arn + kmsKeyId = data.aws_kms_key.ebs_key.arn + }) storage_provisioner = "kubernetes.io/aws-ebs" reclaim_policy = "Delete" volume_binding_mode = "Immediate" @@ -79,3 +86,4 @@ resource "null_resource" "delete_default_sc" { ## "volumeBindingMode": "WaitForFirstConsumer" ## } + diff --git a/examples/full-cluster-tf-upgrade/policy.tf b/examples/full-cluster-tf-upgrade/policy.tf index 9b5a4e9..b7ea3b0 100644 --- a/examples/full-cluster-tf-upgrade/policy.tf +++ b/examples/full-cluster-tf-upgrade/policy.tf @@ -149,11 +149,10 @@ locals { "eks:AccessKubernetesApi", ] resources = flatten(concat( - tolist(format(local.common_arn, "eks", format("/clusters/%v/addons", var.cluster_name))), - [for r in local.eks_resources : tolist( - format(local.common_arn, "eks", format("%v/%v", r, var.cluster_name)), - format(local.common_arn, "eks", format("%v/%v/*", r, var.cluster_name)) - )])) + [format(local.common_arn, "eks", format("/clusters/%v/addons", var.cluster_name))], + [for r in local.eks_resources : [format(local.common_arn, "eks", format("%v/%v", r, var.cluster_name)), + format(local.common_arn, "eks", format("%v/%v/*", r, var.cluster_name))]] + )) } } }