Skip to content

Commit 89ceeae

Browse files
lara-template-sync[bot]jaygridley
andauthored
feat(sync): sync universal-addon changes (#13)
Merge https://github.com/lablabs/terraform-aws-eks-universal-addon 63a0913 Signed-off-by: jaygridley <[email protected]> Co-authored-by: jaygridley <[email protected]>
1 parent 3f721da commit 89ceeae

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

addon-irsa.tf

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,44 @@ module "addon-irsa" {
66

77
enabled = var.enabled
88

9-
rbac_create = var.rbac_create != null ? var.rbac_create : lookup(local.addon, "rbac_create", null)
10-
service_account_create = var.service_account_create != null ? var.service_account_create : lookup(local.addon, "service_account_create", null)
11-
service_account_name = var.service_account_name != null ? var.service_account_name : lookup(local.addon, "service_account_name", local.addon_name)
12-
service_account_namespace = var.service_account_namespace != null ? var.service_account_namespace : lookup(local.addon, "service_account_namespace", local.addon_namespace)
9+
rbac_create = var.rbac_create != null ? var.rbac_create : lookup(each.value, "rbac_create", null)
10+
service_account_create = var.service_account_create != null ? var.service_account_create : lookup(each.value, "service_account_create", null)
11+
service_account_name = var.service_account_name != null ? var.service_account_name : lookup(each.value, "service_account_name", local.addon_name)
12+
service_account_namespace = var.service_account_namespace != null ? var.service_account_namespace : lookup(each.value, "service_account_namespace", local.addon_namespace)
1313

1414
# IRSA
15-
cluster_identity_oidc_issuer = var.cluster_identity_oidc_issuer != null ? var.cluster_identity_oidc_issuer : lookup(local.addon, "cluster_identity_oidc_issuer", null)
16-
cluster_identity_oidc_issuer_arn = var.cluster_identity_oidc_issuer_arn != null ? var.cluster_identity_oidc_issuer_arn : lookup(local.addon, "cluster_identity_oidc_issuer_arn", null)
15+
cluster_identity_oidc_issuer = var.cluster_identity_oidc_issuer != null ? var.cluster_identity_oidc_issuer : lookup(each.value, "cluster_identity_oidc_issuer", null)
16+
cluster_identity_oidc_issuer_arn = var.cluster_identity_oidc_issuer_arn != null ? var.cluster_identity_oidc_issuer_arn : lookup(each.value, "cluster_identity_oidc_issuer_arn", null)
1717

18-
irsa_role_create = var.irsa_role_create != null ? var.irsa_role_create : lookup(local.addon, "irsa_role_create", null)
19-
irsa_role_name_prefix = var.irsa_role_name_prefix != null ? var.irsa_role_name_prefix : lookup(local.addon, "irsa_role_name_prefix", "${local.addon.name}-irsa")
20-
irsa_role_name = var.irsa_role_name != null ? var.irsa_role_name : lookup(local.addon, "irsa_role_name", local.addon_name)
18+
irsa_role_create = var.irsa_role_create != null ? var.irsa_role_create : lookup(each.value, "irsa_role_create", null)
19+
irsa_role_name_prefix = var.irsa_role_name_prefix != null ? var.irsa_role_name_prefix : lookup(each.value, "irsa_role_name_prefix", "${local.addon.name}-irsa")
20+
irsa_role_name = var.irsa_role_name != null ? var.irsa_role_name : lookup(each.value, "irsa_role_name", local.addon_name)
2121

22-
irsa_policy_enabled = var.irsa_policy_enabled != null ? var.irsa_policy_enabled : lookup(local.addon, "irsa_policy_enabled", null)
23-
irsa_policy = var.irsa_policy != null ? var.irsa_policy : lookup(local.addon, "irsa_policy", null)
24-
irsa_assume_role_enabled = var.irsa_assume_role_enabled != null ? var.irsa_assume_role_enabled : lookup(local.addon, "irsa_assume_role_enabled", null)
25-
irsa_assume_role_arns = var.irsa_assume_role_arns != null ? var.irsa_assume_role_arns : lookup(local.addon, "irsa_assume_role_arns", null)
26-
irsa_permissions_boundary = var.irsa_permissions_boundary != null ? var.irsa_permissions_boundary : lookup(local.addon, "irsa_permissions_boundary", null)
27-
irsa_additional_policies = var.irsa_additional_policies != null ? var.irsa_additional_policies : lookup(local.addon, "irsa_additional_policies", null)
22+
irsa_policy_enabled = var.irsa_policy_enabled != null ? var.irsa_policy_enabled : lookup(each.value, "irsa_policy_enabled", null)
23+
irsa_policy = var.irsa_policy != null ? var.irsa_policy : lookup(each.value, "irsa_policy", null)
24+
irsa_assume_role_enabled = var.irsa_assume_role_enabled != null ? var.irsa_assume_role_enabled : lookup(each.value, "irsa_assume_role_enabled", null)
25+
irsa_assume_role_arns = var.irsa_assume_role_arns != null ? var.irsa_assume_role_arns : lookup(each.value, "irsa_assume_role_arns", null)
26+
irsa_permissions_boundary = var.irsa_permissions_boundary != null ? var.irsa_permissions_boundary : lookup(each.value, "irsa_permissions_boundary", null)
27+
irsa_additional_policies = var.irsa_additional_policies != null ? var.irsa_additional_policies : lookup(each.value, "irsa_additional_policies", null)
2828

29-
irsa_assume_role_policy_condition_test = var.irsa_assume_role_policy_condition_test != null ? var.irsa_assume_role_policy_condition_test : lookup(local.addon, "irsa_assume_role_policy_condition_test", null)
30-
irsa_assume_role_policy_condition_values = var.irsa_assume_role_policy_condition_values != null ? var.irsa_assume_role_policy_condition_values : lookup(local.addon, "irsa_assume_role_policy_condition_values", null)
29+
irsa_assume_role_policy_condition_test = var.irsa_assume_role_policy_condition_test != null ? var.irsa_assume_role_policy_condition_test : lookup(each.value, "irsa_assume_role_policy_condition_test", null)
30+
irsa_assume_role_policy_condition_values = var.irsa_assume_role_policy_condition_values != null ? var.irsa_assume_role_policy_condition_values : lookup(each.value, "irsa_assume_role_policy_condition_values", null)
3131

32-
irsa_tags = var.irsa_tags != null ? var.irsa_tags : lookup(local.addon, "irsa_tags", null)
32+
irsa_tags = var.irsa_tags != null ? var.irsa_tags : lookup(each.value, "irsa_tags", null)
3333

3434
# Pod identity
35-
cluster_name = var.cluster_name != null ? var.cluster_name : lookup(local.addon, "cluster_name", null)
35+
cluster_name = var.cluster_name != null ? var.cluster_name : lookup(each.value, "cluster_name", null)
3636

37-
pod_identity_role_create = var.pod_identity_role_create != null ? var.pod_identity_role_create : lookup(local.addon, "pod_identity_role_create", null)
38-
pod_identity_role_name_prefix = var.pod_identity_role_name_prefix != null ? var.pod_identity_role_name_prefix : lookup(local.addon, "pod_identity_role_name_prefix", "${local.addon.name}-pi")
39-
pod_identity_role_name = var.pod_identity_role_name != null ? var.pod_identity_role_name : lookup(local.addon, "pod_identity_role_name", local.addon_name)
37+
pod_identity_role_create = var.pod_identity_role_create != null ? var.pod_identity_role_create : lookup(each.value, "pod_identity_role_create", null)
38+
pod_identity_role_name_prefix = var.pod_identity_role_name_prefix != null ? var.pod_identity_role_name_prefix : lookup(each.value, "pod_identity_role_name_prefix", "${local.addon.name}-pi")
39+
pod_identity_role_name = var.pod_identity_role_name != null ? var.pod_identity_role_name : lookup(each.value, "pod_identity_role_name", local.addon_name)
4040

41-
pod_identity_policy_enabled = var.pod_identity_policy_enabled != null ? var.pod_identity_policy_enabled : lookup(local.addon, "pod_identity_policy_enabled", null)
42-
pod_identity_policy = var.pod_identity_policy != null ? var.pod_identity_policy : lookup(local.addon, "pod_identity_policy", null)
43-
pod_identity_permissions_boundary = var.pod_identity_permissions_boundary != null ? var.pod_identity_permissions_boundary : lookup(local.addon, "pod_identity_permissions_boundary", null)
44-
pod_identity_additional_policies = var.pod_identity_additional_policies != null ? var.pod_identity_additional_policies : lookup(local.addon, "pod_identity_additional_policies", null)
41+
pod_identity_policy_enabled = var.pod_identity_policy_enabled != null ? var.pod_identity_policy_enabled : lookup(each.value, "pod_identity_policy_enabled", null)
42+
pod_identity_policy = var.pod_identity_policy != null ? var.pod_identity_policy : lookup(each.value, "pod_identity_policy", null)
43+
pod_identity_permissions_boundary = var.pod_identity_permissions_boundary != null ? var.pod_identity_permissions_boundary : lookup(each.value, "pod_identity_permissions_boundary", null)
44+
pod_identity_additional_policies = var.pod_identity_additional_policies != null ? var.pod_identity_additional_policies : lookup(each.value, "pod_identity_additional_policies", null)
4545

46-
pod_identity_tags = var.pod_identity_tags != null ? var.pod_identity_tags : lookup(local.addon, "pod_identity_tags", null)
46+
pod_identity_tags = var.pod_identity_tags != null ? var.pod_identity_tags : lookup(each.value, "pod_identity_tags", null)
4747
}
4848

4949
output "addon_irsa" {

0 commit comments

Comments
 (0)