Skip to content

feat: Allow removing KMS and SSM permissions from EKS IRSA external secrets policy #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.96.3
rev: v1.99.0
hooks:
- id: terraform_fmt
- id: terraform_wrapper_module_for_each
Expand Down
39 changes: 30 additions & 9 deletions modules/iam-role-for-service-accounts-eks/policies.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ data "aws_iam_policy_document" "cluster_autoscaler" {
dynamic "statement" {
# TODO - remove *_ids at next breaking change
for_each = toset(coalescelist(var.cluster_autoscaler_cluster_ids, var.cluster_autoscaler_cluster_names))

content {
actions = [
"autoscaling:SetDesiredCapacity",
Expand Down Expand Up @@ -306,6 +307,7 @@ data "aws_iam_policy_document" "ebs_csi" {

dynamic "statement" {
for_each = length(var.ebs_csi_kms_cmk_ids) > 0 ? [1] : []

content {
actions = [
"kms:CreateGrant",
Expand All @@ -325,6 +327,7 @@ data "aws_iam_policy_document" "ebs_csi" {

dynamic "statement" {
for_each = length(var.ebs_csi_kms_cmk_ids) > 0 ? [1] : []

content {
actions = [
"kms:Encrypt",
Expand Down Expand Up @@ -455,6 +458,7 @@ data "aws_iam_policy_document" "mountpoint_s3_csi" {

dynamic "statement" {
for_each = length(var.mountpoint_s3_csi_kms_arns) > 0 ? [1] : []

content {
actions = [
"kms:GenerateDataKey",
Expand Down Expand Up @@ -539,12 +543,17 @@ data "aws_iam_policy_document" "external_secrets" {
resources = ["*"]
}

statement {
actions = [
"ssm:GetParameter",
"ssm:GetParameters",
]
resources = var.external_secrets_ssm_parameter_arns
dynamic "statement" {
for_each = length(var.external_secrets_ssm_parameter_arns) > 0 ? [1] : []

content {
actions = [
"ssm:GetParameter",
"ssm:GetParameters",
]

resources = var.external_secrets_ssm_parameter_arns
}
}

statement {
Expand All @@ -562,13 +571,18 @@ data "aws_iam_policy_document" "external_secrets" {
resources = var.external_secrets_secrets_manager_arns
}

statement {
actions = ["kms:Decrypt"]
resources = var.external_secrets_kms_key_arns
dynamic "statement" {
for_each = length(var.external_secrets_kms_key_arns) > 0 ? [1] : []

content {
actions = ["kms:Decrypt"]
resources = var.external_secrets_kms_key_arns
}
}

dynamic "statement" {
for_each = var.external_secrets_secrets_manager_create_permission ? [1] : []

content {
actions = [
"secretsmanager:CreateSecret",
Expand All @@ -581,9 +595,11 @@ data "aws_iam_policy_document" "external_secrets" {

dynamic "statement" {
for_each = var.external_secrets_secrets_manager_create_permission ? [1] : []

content {
actions = ["secretsmanager:DeleteSecret"]
resources = var.external_secrets_secrets_manager_arns

condition {
test = "StringEquals"
variable = "secretsmanager:ResourceTag/managed-by"
Expand Down Expand Up @@ -631,6 +647,7 @@ data "aws_iam_policy_document" "fsx_lustre_csi" {
statement {
actions = ["iam:CreateServiceLinkedRole"]
resources = ["*"]

condition {
test = "StringLike"
variable = "iam:AWSServiceName"
Expand Down Expand Up @@ -1201,6 +1218,7 @@ data "aws_iam_policy_document" "appmesh_controller" {
"iam:CreateServiceLinkedRole"
]
resources = ["arn:${local.partition}:iam::*:role/aws-service-role/appmesh.${local.dns_suffix}/AWSServiceRoleForAppMesh"]

condition {
test = "StringLike"
variable = "iam:AWSServiceName"
Expand Down Expand Up @@ -1459,6 +1477,7 @@ data "aws_iam_policy_document" "vpc_cni" {
# arn:${local.partition}:iam::aws:policy/AmazonEKS_CNI_Policy
dynamic "statement" {
for_each = var.vpc_cni_enable_ipv4 ? [1] : []

content {
sid = "IPV4"
actions = [
Expand All @@ -1482,6 +1501,7 @@ data "aws_iam_policy_document" "vpc_cni" {
# https://docs.aws.amazon.com/eks/latest/userguide/cni-iam-role.html#cni-iam-role-create-ipv6-policy
dynamic "statement" {
for_each = var.vpc_cni_enable_ipv6 ? [1] : []

content {
sid = "IPV6"
actions = [
Expand All @@ -1498,6 +1518,7 @@ data "aws_iam_policy_document" "vpc_cni" {
# https://docs.aws.amazon.com/eks/latest/userguide/cni-network-policy.html#cni-network-policy-setup
dynamic "statement" {
for_each = var.vpc_cni_enable_cloudwatch_logs ? [1] : []

content {
sid = "CloudWatchLogs"
actions = [
Expand Down