Skip to content

Commit 545ab45

Browse files
committed
Fix perpetual drift in when include_oidc_root_ca_thumbprint is enabled
1 parent 2f14548 commit 545ab45

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ locals {
440440
create_oidc_provider = local.create && var.enable_irsa && !local.create_outposts_local_cluster
441441

442442
oidc_root_ca_thumbprint = local.create_oidc_provider && var.include_oidc_root_ca_thumbprint ? [data.tls_certificate.this[0].certificates[0].sha1_fingerprint] : []
443+
oidc_thumprint_list = concat(local.oidc_root_ca_thumbprint, var.custom_oidc_thumbprints)
443444
}
444445

445446
data "tls_certificate" "this" {
@@ -454,7 +455,7 @@ resource "aws_iam_openid_connect_provider" "oidc_provider" {
454455
count = local.create_oidc_provider ? 1 : 0
455456

456457
client_id_list = distinct(compact(concat(["sts.amazonaws.com"], var.openid_connect_audiences)))
457-
thumbprint_list = concat(local.oidc_root_ca_thumbprint, var.custom_oidc_thumbprints)
458+
thumbprint_list = length(local.oidc_thumprint_list) == 0 ? null : local.oidc_thumprint_list
458459
url = aws_eks_cluster.this[0].identity[0].oidc[0].issuer
459460

460461
tags = merge(

0 commit comments

Comments
 (0)