Skip to content

Revert "Disallow unrestricted S3 IAM policies" #1076

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Revert "Disallow unrestricted S3 IAM policies" #1076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 8 additions & 45 deletions pod-configs/module/s3/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,11 @@ resource "aws_iam_policy" "s3_policy" {
Version = "2012-10-17"
Statement = [
{
Sid = "S3ReadOperations"
Effect = "Allow"
Action = [
"s3:GetObject",
"s3:GetObjectVersion",
"s3:GetObjectVersionTagging",
"s3:GetObjectTagging",
"s3:ListBucket",
"s3:ListBucketVersions",
"s3:ListBucketMultipartUploads"
]
Resource = [
"arn:aws:s3:::${var.cluster_name}-*",
"arn:aws:s3:::${var.cluster_name}-*/*"
]
Action = "s3:*",
Sid = "VisualEditor0"
Effect = "Allow"
Resource = "arn:aws:s3:::${var.cluster_name}-*"
},
{
Sid = "S3WriteOperations"
Effect = "Allow"
Action = [
"s3:PutObject",
"s3:PutObjectTagging",
"s3:DeleteObject",
"s3:AbortMultipartUpload",
"s3:ListMultipartUploadParts"
]
Resource = "arn:aws:s3:::${var.cluster_name}-*/*"
}
]
})
}
Expand All @@ -55,16 +32,8 @@ data "aws_eks_cluster" "eks" {
}

locals {
# Read-only service accounts
readonly_service_accounts = [
"system:serviceaccount:orch-platform:aws-s3-sa-mimir-read",
"system:serviceaccount:orch-platform:aws-s3-sa-loki-read",
"system:serviceaccount:orch-infra:aws-s3-sa-mimir-read",
"system:serviceaccount:orch-infra:aws-s3-sa-loki-read"
]

# Read-write service accounts
readwrite_service_accounts = [
service_accounts = [
// namespace:account-name
"system:serviceaccount:orch-platform:aws-s3-sa-mimir",
"system:serviceaccount:orch-platform:aws-s3-sa-loki",
"system:serviceaccount:orch-infra:aws-s3-sa-mimir",
Expand All @@ -81,12 +50,7 @@ data "aws_iam_policy_document" "s3_policy" {
variable = "${replace(data.aws_eks_cluster.eks.identity[0].oidc[0].issuer, "https://", "")}:sub"
// https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_condition-logic-multiple-context-keys-or-values.html
// If a single condition operator includes multiple values for a context key, those values are evaluated using a logical OR.
values = concat(local.readonly_service_accounts, local.readwrite_service_accounts)
}
condition {
test = "StringEquals"
variable = "${replace(data.aws_eks_cluster.eks.identity[0].oidc[0].issuer, "https://", "")}:aud"
values = ["sts.amazonaws.com"]
values = local.service_accounts
}
principals {
identifiers = ["arn:aws:iam::${var.aws_accountid}:oidc-provider/${replace(data.aws_eks_cluster.eks.identity[0].oidc[0].issuer, "https://", "")}"]
Expand All @@ -95,9 +59,8 @@ data "aws_iam_policy_document" "s3_policy" {
}
}

# Read-write IAM role
resource "aws_iam_role" "s3_role" {
description = "Role that can read/write S3 buckets in ${var.cluster_name} cluster"
description = "Role that can access S3 buckets in ${var.cluster_name} cluster"
name = "${var.cluster_name}-s3-role"
assume_role_policy = data.aws_iam_policy_document.s3_policy.json
managed_policy_arns = [aws_iam_policy.s3_policy.arn]
Expand Down
Loading