Skip to content

Commit

Permalink
fix: update naming conevension for policy and IAM name (#31)
Browse files Browse the repository at this point in the history 
Co-authored-by: Anmol Nagpal <4303310+anmolnagpal@users.noreply.github.com>
  • Loading branch information
@nileshgadgi @anmolnagpal
nileshgadgi and anmolnagpal committed Sep 27, 2023
1 parent b6f5fac commit faeb310
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion addons/aws-ebs-csi-driver/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module "helm_addon" {
# -- IRSA Configurations
irsa_config = {
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
create_kubernetes_service_account = true
kubernetes_service_account = "${local.name}-sa"
kubernetes_namespace = local.default_helm_config.namespace
Expand Down
4 changes: 2 additions & 2 deletions addons/aws-efs-csi-driver/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module "helm_addon" {
# -- IRSA Configurations
irsa_config = {
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
create_kubernetes_service_account = true
kubernetes_service_account = "${local.name}-sa"
kubernetes_namespace = local.default_helm_config.namespace
Expand All @@ -39,7 +39,7 @@ module "helm_addon" {
}

resource "aws_iam_policy" "policy" {
name = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
name = "${local.name}-${var.eks_cluster_name}"
path = "/"
description = "IAM Policy used by ${local.name}-${var.eks_cluster_name} IAM Role"
policy = var.iampolicy_json_content != null ? var.iampolicy_json_content : <<-EOT
Expand Down
2 changes: 1 addition & 1 deletion addons/aws-efs-csi-driver/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "service_account" {
}

output "iam_policy" {
value = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
value = "${local.name}-${var.eks_cluster_name}"
}

output "namespace" {
Expand Down
4 changes: 2 additions & 2 deletions addons/aws-load-balancer-controller/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module "helm_addon" {
# -- IRSA Configurations
irsa_config = {
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
create_kubernetes_service_account = true
kubernetes_service_account = "${local.name}-sa"
kubernetes_namespace = local.default_helm_config.namespace
Expand All @@ -43,7 +43,7 @@ module "helm_addon" {
}

resource "aws_iam_policy" "policy" {
name = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
name = "${local.name}-${var.eks_cluster_name}"
path = "/"
description = "IAM Policy used by ${local.name}-${var.eks_cluster_name} IAM Role"
policy = var.iampolicy_json_content != null ? var.iampolicy_json_content : <<-EOT
Expand Down
2 changes: 1 addition & 1 deletion addons/aws-load-balancer-controller/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "service_account" {
}

output "iam_policy" {
value = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
value = "${local.name}-${var.eks_cluster_name}"
}

output "namespace" {
Expand Down
4 changes: 2 additions & 2 deletions addons/cluster-autoscaler/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module "helm_addon" {
# -- IRSA Configurations
irsa_config = {
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
create_kubernetes_service_account = true
kubernetes_service_account = "${local.name}-sa"
kubernetes_namespace = local.default_helm_config.namespace
Expand All @@ -38,7 +38,7 @@ module "helm_addon" {
}

resource "aws_iam_policy" "policy" {
name = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
name = "${local.name}-${var.eks_cluster_name}"
path = "/"
description = "IAM Policy used by ${local.name}-${var.eks_cluster_name} IAM Role"
policy = var.iampolicy_json_content != null ? var.iampolicy_json_content : <<-EOT
Expand Down
2 changes: 1 addition & 1 deletion addons/cluster-autoscaler/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "service_account" {
}

output "iam_policy" {
value = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
value = "${local.name}-${var.eks_cluster_name}"
}

output "namespace" {
Expand Down
4 changes: 2 additions & 2 deletions addons/external-secrets/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module "helm_addon" {
# -- IRSA Configurations
irsa_config = {
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
create_kubernetes_service_account = true
kubernetes_service_account = "${local.name}-sa"
kubernetes_namespace = local.default_helm_config.namespace
Expand All @@ -48,7 +48,7 @@ module "helm_addon" {
}

resource "aws_iam_policy" "policy" {
name = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
name = "${local.name}-${var.eks_cluster_name}"
path = "/"
description = "IAM Policy used by ${local.name}-${var.eks_cluster_name} IAM Role"
policy = data.aws_iam_policy_document.iam-policy.json
Expand Down
2 changes: 1 addition & 1 deletion addons/external-secrets/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ output "service_account" {
}

output "iam_policy" {
value = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
value = "${local.name}-${var.eks_cluster_name}"
}

output "namespace" {
Expand Down
4 changes: 2 additions & 2 deletions addons/fluent-bit/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module "helm_addon" {
# -- IRSA Configurations
irsa_config = {
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
create_kubernetes_service_account = true
kubernetes_service_account = "${local.name}-sa"
kubernetes_namespace = local.default_helm_config.namespace
Expand All @@ -42,7 +42,7 @@ module "helm_addon" {
}

resource "aws_iam_policy" "policy" {
name = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
name = "${local.name}-${var.eks_cluster_name}"
path = "/"
description = "IAM Policy used by ${local.name}-${var.eks_cluster_name} IAM Role"
policy = var.iampolicy_json_content != null ? var.iampolicy_json_content : <<-EOT
Expand Down
2 changes: 1 addition & 1 deletion addons/fluent-bit/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "service_account" {
}

output "iam_policy" {
value = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
value = "${local.name}-${var.eks_cluster_name}"
}

output "namespace" {
Expand Down
4 changes: 2 additions & 2 deletions addons/karpenter/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module "helm_addon" {
# -- IRSA Configurations
irsa_config = {
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
create_kubernetes_service_account = true
kubernetes_service_account = "${local.name}-sa"
kubernetes_namespace = local.default_helm_config.namespace
Expand All @@ -43,7 +43,7 @@ module "helm_addon" {
}

resource "aws_iam_policy" "policy" {
name = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
name = "${local.name}-${var.eks_cluster_name}"
path = "/"
description = "IAM Policy used by ${local.name}-${var.eks_cluster_name} IAM Role"
policy = var.iampolicy_json_content != null ? var.iampolicy_json_content : <<-EOT
Expand Down
2 changes: 1 addition & 1 deletion addons/karpenter/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "service_account" {
}

output "iam_policy" {
value = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
value = "${local.name}-${var.eks_cluster_name}"
}

output "namespace" {
Expand Down
4 changes: 2 additions & 2 deletions addons/velero/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ module "helm_addon" {
kubernetes_namespace = local.default_helm_config.namespace
kubernetes_service_account = "${local.name}-sa"
irsa_iam_policies = [aws_iam_policy.policy.arn]
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}-IAM-Role"
irsa_iam_role_name = "${local.name}-${var.eks_cluster_name}"
eks_oidc_provider_arn = replace(data.aws_eks_cluster.eks_cluster.identity[0].oidc[0].issuer, "https://", "")
account_id = var.account_id
}
}
resource "aws_iam_policy" "policy" {
name = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
name = "${local.name}-${var.eks_cluster_name}"
path = "/"
description = "IAM Policy used by ${local.name}-${var.eks_cluster_name} IAM Role"
policy = var.iampolicy_json_content != null ? var.iampolicy_json_content : <<-EOT
Expand Down
2 changes: 1 addition & 1 deletion addons/velero/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "service_account" {
}

output "iam_policy" {
value = "${local.name}-${var.eks_cluster_name}-IAM-Policy"
value = "${local.name}-${var.eks_cluster_name}"
}

output "namespace" {
Expand Down

0 comments on commit faeb310

Please sign in to comment.